Commit Graph

6481 Commits (2f4868553a1f79da8695c42a0d00aa4e5e729b58)
 

Author SHA1 Message Date
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
ELF ae294252ee 修改
郑永星 65da5b6b6e Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点功能修改
zhengyongxing 23555f8d4d 特殊补点功能修改
郑永星 5a60c36b7a Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点bug修正
zhengyongxing 0215082018 特殊补点bug修正
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing cd331f2c64 上下游聚合打款信息修改
陈志 b80d36395a Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化导出
chenzhi 9234919180 优化导出
陈志 a78188632f Merge branch 'feature/finance_statement_three' of wmtx/platform into release
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
郑永星 e3a19c8fc6 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点汇总功能修改
zhengyongxing 2c005d1996 特殊补点汇总功能修改
zhengyongxing 4ed51cb112 上下游聚合打款信息修改
chenzhi c795e5de6c 优化下游个人汇总样式
郑永星 23966187c0 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊补点功能修正
zhengyongxing f4aeae340d 特殊补点功能修正
郑永星 d0aec76e3e Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing 565d3c9576 特殊补点功能修改
陈志 faa628977b Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
陈志 8fbf101e88 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
chenzhi ce5a83e9bc 优化汇总导出错误
zhengyongxing 50495e73ca 特殊补点功能修改
zhengyongxing 6103908d83 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementController.class.php
	Application/Admin/Controller/CompanyStatementPoolController.class.php
zhengyongxing 872de1ff73 上下游聚合打款信息修改
zhengyongxing b75e0725a1 特殊补点功能修改
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改
ELF 1fbb9f097e ss
ELF 53f2649d9a ss
ELF 32bc839dcd 合并
陈志 fbdab69c71 Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
ELF e0bbec0978 修改
廖金灵 fcb2027dc8 Merge branch 'hotfix/add_company_partner' of wmtx/platform into master
优化上游添加错误
chenzhi 57b692cd67 优化上游添加错误
陈志 be2851cecc Merge branch 'feature/finance_statement_three' of wmtx/platform into release
chenzhi 180332ab87 优化下游未汇总导出
ELF ad2037408d 优化
陈志 25a9ea7262 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
新增线下打款确认
chenzhi 4a98c587fa 新增线下打款确认
ELF 7614d5feca 修改
ELF 9d041f7c8a 修改
ELF e441f030c0 优化
ELF e9038d7471 ss
chenzhi 69cf42e895 新增线下确认打款
ELF 9b88e97672 修改
ELF 296e378501 修改
ELF e4854aca3a 修改
chenzhi e2d179acd8 新增线下打款