1701 Commits (175b2f92f7168203cee4337b2c2dce4d6bc4a038)

Author SHA1 Message Date
chenzhi 175b2f92f7 优化绑定币搜索 5 years ago
郑永星 7f3de4d901 Merge branch 'feature/company_export_change' of wmtx/platform into release
下游导出修正
5 years ago
zhengyongxing f0c425ae82 下游导出修正 5 years ago
郑永星 0010a39c76 Merge branch 'feature/company_export_change' of wmtx/platform into release 5 years ago
zhengyongxing 3c6418425a 上游导出修正 5 years ago
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
5 years ago
ELF 6596e01a29 修改 5 years ago
zhengyongxing 65532fc0ab Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
 Conflicts:
	Application/Admin/Controller/PromoteCompanyController.class.php
	Application/Base/Tool/AggregateClient.class.php
5 years ago
ELF 6e2fda1e26 解决冲突 5 years ago
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
5 years ago
zhengyongxing 23555f8d4d 特殊补点功能修改 5 years ago
chenzhi 9234919180 优化导出 5 years ago
chenzhi 6cb4ecb930 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 5 years ago
zhengyongxing 4ed51cb112 上下游聚合打款信息修改 5 years ago
chenzhi c795e5de6c 优化下游个人汇总样式 5 years ago
zhengyongxing f4aeae340d 特殊补点功能修正 5 years ago
zhengyongxing 565d3c9576 特殊补点功能修改 5 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
5 years ago
chenzhi ce5a83e9bc 优化汇总导出错误 5 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
5 years ago
zhengyongxing 872de1ff73 上下游聚合打款信息修改 5 years ago
zhengyongxing b75e0725a1 特殊补点功能修改 5 years ago
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改 5 years ago
ELF 1fbb9f097e ss 5 years ago
ELF 53f2649d9a ss 5 years ago
ELF 32bc839dcd 合并 5 years ago
ELF e0bbec0978 修改 5 years ago
chenzhi 180332ab87 优化下游未汇总导出 5 years ago
ELF ad2037408d 优化 5 years ago
chenzhi 4a98c587fa 新增线下打款确认 5 years ago
ELF e441f030c0 优化 5 years ago
chenzhi 69cf42e895 新增线下确认打款 5 years ago
ELF 9b88e97672 修改 5 years ago
chenzhi e2d179acd8 新增线下打款 5 years ago
zhengyongxing 9000533644 下游公司功能提交 5 years ago
ELF 1a14ed8dc7 修改 5 years ago
zhengyongxing 24e33ed8ba Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
5 years ago
chenzhi 79468aa6f2 新增结算删除 5 years ago
ELF 42547128d4 优化押金 5 years ago
chenzhi 36d72848bb 优化市场专员 5 years ago
ELF 7adabb54f9 修改 5 years ago
elf@home 50755b89c5 修改 5 years ago
zyx 89801c1467 特殊补点功能完善 5 years ago
zhengyongxing e6bc6853aa 特殊补点结算功能添加 5 years ago
ELF cc6c5d4e74 修改 5 years ago
chenzhi 6e49bcc353 优化财务汇总 5 years ago
ELF 2867a05bb3 修改 5 years ago
chenzhi f0e43df7c2 新增重算 5 years ago
ELF 0923006a20 修改 5 years ago
chenzhi f5ad1a6d0c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement_three 5 years ago