2733 Commits (2ae89b9edb62415e7ca24b09d3199c422d8b076c)

Author SHA1 Message Date
郑永星 1eef1ea4c3 Merge branch 'feature/add_item' of wmtx/platform into release
审核拒绝bug修正
4 years ago
zhengyongxing 7d3c8ebd61 审核拒绝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
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
郑永星 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
ELF 268ea4e34d 修改 4 years ago
zhengyongxing 465f095dc4 市场业绩bug修正 4 years ago
chenzhi 7a8b91c8f0 优化下游同游戏判断 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
chenzhi 02aa1bd088 优化1 4 years ago
zhengyongxing c9516b8751 未汇总汇总功能提交 4 years ago
zhengyongxing 4b44356a6d Revert "优化下游个人同游戏判断"
This reverts commit f22dc90e
4 years ago
chenzhi f22dc90e96 优化下游个人同游戏判断 4 years ago
zhengyongxing 2cdc4e815b 下游公司cp比例修改 4 years ago
zhengyongxing 28f73f3140 公司比例格式修改 4 years ago
chenzhi 3ef485516f 优化工会游戏修改 4 years ago
zhengyongxing c366fcfe4e 汇总编辑功能提交 4 years ago
zhengyongxing 825d4e51c9 聚合公司绑定功能修改 4 years ago
zhengyongxing 4e9bde9c10 汇总编辑提交 4 years ago
zhengyongxing 9a6bc50eca 聚合公司绑定编辑修改 4 years ago
zhengyongxing d937dbad55 聚合公司绑定功能修改 4 years ago
zhengyongxing 31568dd37c 聚合公司汇总编辑功能添加 4 years ago
zhengyongxing 14ad9ce93d 聚合公司绑定功能及汇总提示语添加 4 years ago
zhengyongxing 4cf512779a 聚合公司绑定功能及汇总提示语添加 4 years ago
zhengyongxing 868889fe54 汇总编辑功能提交 4 years ago
zhengyongxing bc627cf224 汇总导出bug修改 4 years ago
ELF ad34536256 修改 4 years ago
zhengyongxing 895b32cee8 汇总bug修改 4 years ago
zhengyongxing 60210fedef 撤销汇总名词修改 4 years ago
zhengyongxing fedcbd605b bug修改 4 years ago
ELF 6fcaa1362c 重置权限缓存 4 years ago
zhengyongxing 518c902b2a 发起汇总修正 4 years ago
zhengyongxing ceef36a7d1 内部公司功能完善 4 years ago