7281 Commits (36e91253639bbff63613b99fdf9372ce425ace48)
 

Author SHA1 Message Date
chenzhi 36e9125363 新增测试订单 4 years ago
chenzhi 96c937b7d3 优化日志 4 years ago
chenzhi c85e9a831f 优化消息异步 4 years ago
chenzhi 14bb68b82e 优化业绩提成 4 years ago
chenzhi df2da60986 优化市场部毛利 4 years ago
chenzhi 1b0124606a 优化市场结算脚本 4 years ago
chenzhi 382f2527a0 优化新增条件 4 years ago
chenzhi c5bc599289 优化游戏统计 4 years ago
chenzhi 813aebfd64 优化统计 4 years ago
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211 4 years ago
郑永星 444cff5f64 Merge pull request '12.28功能提交' (#52) from feature/add_item into release
12.28功能提交
4 years ago
zhengyongxing d1b0ec55a8 12.28功能提交 4 years ago
郑永星 1496fa349a Merge pull request '12.28功能提交' (#51) from feature/add_item into release
12.28功能提交
4 years ago
zhengyongxing 0293fd7ff1 12.28功能提交 4 years ago
chenzhi f0829e84cc 优化统计 4 years ago
zhengyongxing bb73235874 12.28功能提交 4 years ago
郑永星 12434fb840 Merge pull request 'feature/add_item' (#50) from feature/add_item into release
12.28功能提交
4 years ago
chenzhi be8a30a2e8 合并 4 years ago
chenzhi b1a34cc9a0 优化不打款汇总 4 years ago
zhengyongxing e84ce56293 12.28功能提交 4 years ago
chenzhi 19f7406298 优化结算 4 years ago
万盟天下 459026d842 Merge pull request '修改bug' (#49) from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/49
4 years ago
ELF a70bffaee3 修改bug 4 years ago
万盟天下 4917d4806f Merge pull request '调试bug' (#48) from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/48
4 years ago
ELF 4f4929ad72 修改 4 years ago
万盟天下 9ded6cb0bd Merge pull request '剑仙诀添加资源发放接口' (#47) from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/47
4 years ago
chenzhi 6aeb73b759 优化财务汇总 4 years ago
ELF 932a082134 剑仙诀添加资源发放接口 4 years ago
chenzhi 90de336434 优化数据 4 years ago
zhengyongxing 08d235c03a 12.28功能提交 4 years ago
zhengyongxing 3c166a913e Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
#	Application/Admin/Controller/CompanyStatementOfflineController.class.php
#	Application/Admin/Controller/StatementMangementController.class.php
#	Application/Payment/Controller/PaymentController.class.php
#	Application/Payment/View/Payment/lists.html
#	Data/update.sql
4 years ago
chenzhi b6c87bfefe 优化首页 4 years ago
廖金灵 599312e809 Merge pull request '紧急需求12.28' (#45) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/45
4 years ago
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' (#46) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
4 years ago
郑永星 cd2d9b3bc2 Merge pull request '12.28功能提交' (#44) from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44
4 years ago
zhengyongxing e0f17ea195 12.28功能提交 4 years ago
chenzhi 0e54b1c376 优化渠道和测试服订单 4 years ago
郑永星 11c7c542f8 Merge pull request '12.28功能提交' (#43) from feature/update_payment into release
12.28功能提交
4 years ago
zhengyongxing d0ee96f7b5 12.28功能提交 4 years ago
郑永星 db487f1033 Merge pull request 'feature/update_payment' (#42) from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/42
4 years ago
zhengyongxing ac70fd3f79 12.28功能提交 4 years ago
zhengyongxing f4027b75b3 12.28功能提交 4 years ago
zhengyongxing eb8478fbb7 12.28功能提交 4 years ago
郑永星 21f957f46f Merge pull request '12.28功能提交' (#41) from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/41
4 years ago
zhengyongxing 08153a8359 12.28功能提交 4 years ago
郑永星 ad7dc1f46d Merge pull request 'feature/update_payment' (#40) from feature/update_payment into release
12.28功能提交
4 years ago
zhengyongxing ffa78964ec 12.28功能提交 4 years ago
zhengyongxing 29e8421266 12.28功能提交 4 years ago
zhengyongxing 4f2f18ad91 12.28功能提交 4 years ago
zhengyongxing 82592dd457 12.28功能提交 4 years ago