3556 Commits (c99cad808c4c6c112045e62ff845e184fdc32535)

Author SHA1 Message Date
zyx c99cad808c 汇总状态的操作修改 4 years ago
zyx 4a7915ef69 汇总状态的操作修改 4 years ago
zyx d42cd15b0b 汇总状态的操作修改 4 years ago
zyx 041006e1b4 汇总状态的操作修改 4 years ago
zyx 2c5889cd50 汇总状态的操作修改 4 years ago
zyx c692e51fa7 汇总状态的操作修改 4 years ago
zyx 52f4cbacb9 汇总状态的操作修改 4 years ago
zyx 178c86a751 撤销汇总添加退回审核状态 4 years ago
zhengyongxing 56593d5ee8 汇总bug修正 4 years ago
zhengyongxing dc5a65903b 汇总bug修正 4 years ago
zhengyongxing ef0c4427ce Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing 4210bb7bf0 汇总bug修正 4 years ago
zhengyongxing b4bdcd24fc 汇总bug流程修正 4 years ago
zhengyongxing e153fb66ca 聚合重新汇总bug修正 4 years ago
万盟天下 9db2434d10 Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
4 years ago
zhengyongxing 2b4ed15a30 聚合公司绑定流程优化 4 years ago
郑永星 8b9c732f6a Merge branch 'feature/add_item' of wmtx/platform into master
审核拒绝bug修正
4 years ago
zhengyongxing 7d3c8ebd61 审核拒绝bug修正 4 years ago
万盟天下 1cb13ebb4c Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
4 years ago
zhengyongxing a2b085562d 聚合汇总bug修正 4 years ago
郑永星 4f9c672aa1 Merge branch 'feature/add_item' of wmtx/platform into release
聚合公司绑定修正
4 years ago
zhengyongxing a977cf5f31 聚合公司绑定修正 4 years ago
郑永星 bdcc9a8e27 Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release
特殊比例bug修正
4 years ago
zhengyongxing 0dd7bceb3f 特殊比例bug修正 4 years ago
ELF 19c782b053 解决冲突 4 years ago
郑永星 2c8c246d31 Merge branch 'feature/add_item' of wmtx/platform into release
汇总权限测试
4 years ago
zhengyongxing 6b486331b5 汇总权限测试 4 years ago
郑永星 66af352eb8 Merge branch 'feature/add_item' of wmtx/platform into release
公司绑定修正
4 years ago
zhengyongxing f4f822d31a 公司绑定修正 4 years ago
郑永星 07e877af4b Merge branch 'feature/add_item' of wmtx/platform into release
绑定公司修正
4 years ago
zhengyongxing f757c10c61 绑定公司修正 4 years ago
郑永星 a825f4757a Merge branch 'feature/add_item' of wmtx/platform into release
小bug修改
4 years ago
zhengyongxing 0ebaf6ed64 小bug修改 4 years ago
郑永星 af65b143bb Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
4 years ago
zhengyongxing c06e53ab31 汇总bug修正 4 years ago
郑永星 e593db626c Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
4 years ago
zhengyongxing 1e67b1d1a1 汇总bug修正 4 years ago
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925 4 years ago
zhengyongxing a1ac92dc02 押金bug修正 4 years ago
ELF 268ea4e34d 修改 4 years ago
zhengyongxing ce0196afea 押金bug修正 4 years ago
zhengyongxing 465f095dc4 市场业绩bug修正 4 years ago
chenzhi 7a8b91c8f0 优化下游同游戏判断 4 years ago
zhengyongxing 5c65f356b2 市场业绩开发类型修正 4 years ago
zhengyongxing 7a021dced5 市场业绩提示语修正 4 years ago
zhengyongxing 15ad0a902b Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
4 years ago
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
4 years ago
万盟天下 9209c4fe38 Merge branch 'hotfix/change_game_0927' of wmtx/platform into release
优化删除游戏报错bug
4 years ago
ELF 24fe97186e 修改 4 years ago
chenzhi c40e366a03 优化删除游戏报错bug 4 years ago