Commit Graph

5665 Commits (8d2e61153bde20090c3e64473a3f64b8102372cc)

Author SHA1 Message Date
ELF 8d2e61153b 修改
elf@home c4eb04428e 修改
ELF afad195062 修改
郑永星 af65b143bb Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
zhengyongxing c06e53ab31 汇总bug修正
郑永星 e593db626c Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
zhengyongxing 1e67b1d1a1 汇总bug修正
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925
zhengyongxing a1ac92dc02 押金bug修正
zhengyongxing ce0196afea 押金bug修正
zhengyongxing 465f095dc4 市场业绩bug修正
chenzhi 7a8b91c8f0 优化下游同游戏判断
zhengyongxing 5c65f356b2 市场业绩开发类型修正
zhengyongxing 7a021dced5 市场业绩提示语修正
zhengyongxing 15ad0a902b Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Data/update.sql
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
万盟天下 9209c4fe38 Merge branch 'hotfix/change_game_0927' of wmtx/platform into release
优化删除游戏报错bug
ELF 24fe97186e 修改
chenzhi c40e366a03 优化删除游戏报错bug
chenzhi 02aa1bd088 优化1
zhengyongxing c9516b8751 未汇总汇总功能提交
zhengyongxing 4b44356a6d Revert "优化下游个人同游戏判断"
This reverts commit f22dc90e
zhengyongxing bc084fa2e1 汇总编辑小数点保留两位
zhengyongxing a86fab6bf6 聚合公司绑定功能修改
zhengyongxing 984619e310 汇总审批撤回bug修改
zhengyongxing a19f668687 财务汇总功能撤回审批修改
chenzhi f22dc90e96 优化下游个人同游戏判断
zhengyongxing 2cdc4e815b 下游公司cp比例修改
zhengyongxing 28f73f3140 公司比例格式修改
chenzhi 3ef485516f 优化工会游戏修改
zhengyongxing 995a860016 汇总编辑功能修改
zhengyongxing c366fcfe4e 汇总编辑功能提交
zhengyongxing 825d4e51c9 聚合公司绑定功能修改
zhengyongxing e8e190a7eb 聚合公司绑定功能修改
zhengyongxing 4e9bde9c10 汇总编辑提交
zhengyongxing 9a6bc50eca 聚合公司绑定编辑修改
zhengyongxing d937dbad55 聚合公司绑定功能修改
zhengyongxing 31568dd37c 聚合公司汇总编辑功能添加
zhengyongxing 14ad9ce93d 聚合公司绑定功能及汇总提示语添加
zhengyongxing 4cf512779a 聚合公司绑定功能及汇总提示语添加
zhengyongxing 868889fe54 汇总编辑功能提交
zhengyongxing 58bd48997f 汇总编辑功能提交
zhengyongxing bc627cf224 汇总导出bug修改
zhengyongxing 895b32cee8 汇总bug修改
zhengyongxing 60210fedef 撤销汇总名词修改
zhengyongxing 0b745ea817 个人汇总添加退款
zhengyongxing ee2304d664 结算性质名词修改
zhengyongxing fedcbd605b bug修改
zhengyongxing ca03b8701f 聚合页面名称修改
zhengyongxing 518c902b2a 发起汇总修正