1715 Commits (1fb2fa7e81042c51d70eb38661ce676c7160b96e)

Author SHA1 Message Date
ELF 1fb2fa7e81 解决冲突 4 years ago
ELF 8d98bd5a36 优化 4 years ago
陈志 e1db5c9a47 Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化重算按钮的出现
4 years ago
chenzhi ae9d7f7574 优化重算按钮的出现 4 years ago
chenzhi 175b2f92f7 优化绑定币搜索 4 years ago
郑永星 e3850d18f5 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
平台结算导出与列表选项修改
4 years ago
zhengyongxing a146dd820a 平台结算导出与列表选项修改 4 years ago
廖金灵 429ded27b8 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
修改
4 years ago
ELF 0ff1089682 修改 4 years ago
廖金灵 7436e7c89d Merge branch 'feature/agg_game_fail' of wmtx/platform into release
测试订单优化
4 years ago
ELF 3c3222ad26 测试订单优化 4 years ago
陈志 3628dd630e Merge branch 'feature/company_export_change' of wmtx/platform into release
上游导出修正
4 years ago
廖金灵 151fa30be5 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
聚合订单查询
4 years ago
ELF a18e4188bd 修改bug 4 years ago
zhengyongxing ae8cf5ad38 上游导出修正 4 years ago
郑永星 7f3de4d901 Merge branch 'feature/company_export_change' of wmtx/platform into release
下游导出修正
4 years ago
zhengyongxing f0c425ae82 下游导出修正 4 years ago
郑永星 0010a39c76 Merge branch 'feature/company_export_change' of wmtx/platform into release 4 years ago
zhengyongxing 3c6418425a 上游导出修正 4 years ago
廖金灵 c9b1326c42 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago
ELF 6596e01a29 修改 4 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
4 years ago
ELF 6e2fda1e26 解决冲突 4 years ago
廖金灵 3690b7d000 Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
4 years ago
zhengyongxing 23555f8d4d 特殊补点功能修改 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 4ed51cb112 上下游聚合打款信息修改 4 years ago
chenzhi c795e5de6c 优化下游个人汇总样式 4 years ago
zhengyongxing f4aeae340d 特殊补点功能修正 4 years ago
zhengyongxing 565d3c9576 特殊补点功能修改 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
chenzhi ce5a83e9bc 优化汇总导出错误 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 872de1ff73 上下游聚合打款信息修改 4 years ago
zhengyongxing b75e0725a1 特殊补点功能修改 4 years ago
zhengyongxing 9265d7c9b6 上下游聚合打款信息修改 4 years ago
ELF 1fbb9f097e ss 4 years ago
ELF 53f2649d9a ss 4 years ago
ELF 32bc839dcd 合并 4 years ago
ELF e0bbec0978 修改 4 years ago
chenzhi 180332ab87 优化下游未汇总导出 4 years ago
ELF ad2037408d 优化 4 years ago
chenzhi 4a98c587fa 新增线下打款确认 4 years ago
ELF e441f030c0 优化 4 years ago
chenzhi 69cf42e895 新增线下确认打款 4 years ago
ELF 9b88e97672 修改 4 years ago
chenzhi e2d179acd8 新增线下打款 4 years ago
zhengyongxing 9000533644 下游公司功能提交 4 years ago
ELF 1a14ed8dc7 修改 4 years ago