6563 Commits (0169d8a2db3a773e4d9327330872a1436d6ccfb4)
 

Author SHA1 Message Date
ELF 0169d8a2db 修改 4 years ago
ELF c42a123ad7 修改 4 years ago
ELF 9b11202deb 修改 4 years ago
ELF 28fbbff699 修改 4 years ago
ELF 8d2e61153b 修改 4 years ago
elf@home c4eb04428e 修改 4 years ago
ELF afad195062 修改 4 years ago
ELF 0f534009b4 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 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
陈志 92336383d5 Merge branch 'feature/new_statement_0925' of wmtx/platform into release
优化下游同游戏判断
4 years ago
chenzhi 12e8500ce3 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/new_statement_0925 4 years ago
郑永星 3e82b38c1c Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
4 years ago
zhengyongxing a1ac92dc02 押金bug修正 4 years ago
郑永星 abf6d852a5 Merge branch 'feature/add_item' of wmtx/platform into release
押金bug修正
4 years ago
zhengyongxing ce0196afea 押金bug修正 4 years ago
郑永星 9626ea6825 Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩bug修正
4 years ago
zhengyongxing 465f095dc4 市场业绩bug修正 4 years ago
chenzhi 7a8b91c8f0 优化下游同游戏判断 4 years ago
郑永星 ad8c189f73 Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩开发类型修正
4 years ago
zhengyongxing 5c65f356b2 市场业绩开发类型修正 4 years ago
郑永星 c7d15eb744 Merge branch 'feature/add_item' of wmtx/platform into release
市场业绩提示语修正
4 years ago
zhengyongxing 7a021dced5 市场业绩提示语修正 4 years ago
郑永星 cb5e1c3b30 Merge branch 'feature/add_item' of wmtx/platform into release
9.29号后台功能提交
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
郑永星 fde38a9aec Merge branch 'feature/company_export_change' of wmtx/platform into release
聚合汇总功能提交
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
万盟天下 e2570b012f Merge branch 'hotfix/add_game_sync' 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 6fcd0f906b Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item 4 years ago
zhengyongxing bc084fa2e1 汇总编辑小数点保留两位 4 years ago
zhengyongxing a86fab6bf6 聚合公司绑定功能修改 4 years ago
zhengyongxing 984619e310 汇总审批撤回bug修改 4 years ago
zhengyongxing a19f668687 财务汇总功能撤回审批修改 4 years ago
chenzhi 76e74a11a5 Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item 4 years ago
chenzhi 90e72b3fc4 Revert "汇总编辑小数点保留两位"
This reverts commit cd9e82dfcb.
4 years ago
chenzhi 6c03a64405 Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item 4 years ago
chenzhi f22dc90e96 优化下游个人同游戏判断 4 years ago
zhengyongxing cd9e82dfcb 汇总编辑小数点保留两位 4 years ago
zhengyongxing dcd730fbe0 聚合公司绑定功能修改 4 years ago
zhengyongxing b539e8d1b0 汇总审批撤回bug修改 4 years ago
zhengyongxing 57fabdd8b4 财务汇总功能撤回审批修改 4 years ago
zhengyongxing 2cdc4e815b 下游公司cp比例修改 4 years ago