2562 Commits (268e08424148770e0a3f8870a665e30f38995caa)

Author SHA1 Message Date
ELF 268e084241 修改 4 years ago
ELF 9d67a4c842 优化 4 years ago
ELF 6596e01a29 修改 4 years ago
ELF 6e2fda1e26 解决冲突 4 years ago
廖金灵 d48e90e1db Merge branch 'feature/new_game_auth' of wmtx/platform into release
新增游戏自动授权
4 years ago
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
4 years ago
zhengyongxing 23555f8d4d 特殊补点功能修改 4 years ago
zhengyongxing 0215082018 特殊补点bug修正 4 years ago
zhengyongxing 3022525c85 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
zhengyongxing cd331f2c64 上下游聚合打款信息修改 4 years ago
chenzhi 9234919180 优化导出 4 years ago
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 4 years ago
zhengyongxing 2c005d1996 特殊补点汇总功能修改 4 years ago
chenzhi c795e5de6c 优化下游个人汇总样式 4 years ago
zhengyongxing f4aeae340d 特殊补点功能修正 4 years ago
zhengyongxing 73dff8839e Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
4 years ago
陈志 8fbf101e88 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
4 years ago
chenzhi ce5a83e9bc 优化汇总导出错误 4 years ago
zhengyongxing 50495e73ca 特殊补点功能修改 4 years ago
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
4 years ago
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改 4 years ago
ELF 32bc839dcd 合并 4 years ago
陈志 fbdab69c71 Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
4 years ago
ELF e0bbec0978 修改 4 years ago
chenzhi 57b692cd67 优化上游添加错误 4 years ago
chenzhi 180332ab87 优化下游未汇总导出 4 years ago
ELF ad2037408d 优化 4 years ago
chenzhi 4a98c587fa 新增线下打款确认 4 years ago
ELF e441f030c0 优化 4 years ago
ELF e9038d7471 ss 4 years ago
chenzhi 69cf42e895 新增线下确认打款 4 years ago
ELF 9b88e97672 修改 4 years ago
ELF 296e378501 修改 4 years ago
ELF e4854aca3a 修改 4 years ago
chenzhi e2d179acd8 新增线下打款 4 years ago
zhengyongxing 9000533644 下游公司功能提交 4 years ago
ELF 1a14ed8dc7 修改 4 years ago
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
chenzhi b35d0a0e95 新增删除日志 4 years ago
chenzhi 79468aa6f2 新增结算删除 4 years ago
ELF 34a22d65bf 修改 4 years ago
ELF 42547128d4 优化押金 4 years ago
chenzhi a18df8c6fb 优化下游个人多比例结算 4 years ago
ELF 7adabb54f9 修改 4 years ago
chenzhi ed66facc8f 优化结算查看 4 years ago
elf@home c40fbf3870 新增游戏自动授权 4 years ago
elf@home 50755b89c5 修改 4 years ago
zyx 89801c1467 特殊补点功能完善 4 years ago
zhengyongxing e6bc6853aa 特殊补点结算功能添加 4 years ago
ELF cc6c5d4e74 修改 4 years ago