7402 Commits (0aa3c514d783d809e06667826a89bacda463c382)
 

Author SHA1 Message Date
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
zhengyongxing c8914800c7 12.28功能提交 4 years ago
zhengyongxing c716535975 12.28功能提交 4 years ago
zhengyongxing 552a6f8181 12.28功能提交 4 years ago
zhengyongxing 6a86a5e76f 12.18功打款能提交 4 years ago
chenzhi 9ab8454970 优化结算汇总 4 years ago
zhengyongxing 8a6191810b 12.18功打款能提交 4 years ago
chenzhi 40005b7177 优化游戏统计 4 years ago
tping ccf0589e4f 导入 4 years ago
chenzhi c0926299dc 优化平台币充值 4 years ago
tping 824b7b3f06 公会信息导入导出 4 years ago
chenzhi fa9dc518d5 导出 4 years ago
chenzhi 4fdb94c617 优化订单查询 4 years ago
chenzhi 45d883e89c 优化渠道统计 4 years ago
zhengyongxing 7c4e0e7521 12.18功能提交 4 years ago
zhengyongxing 8430fa1813 12.18功能提交 4 years ago
chenzhi 19c62de87c 優化公會統計 4 years ago
廖金灵 cd46d4c685 Merge pull request '刷新' (#39) from hotfix/1211bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/39
4 years ago
张谷成 e669d1bc38 Merge pull request '刷新' (#38) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/38
4 years ago
tping 6e63176176 刷新 4 years ago
廖金灵 5dbf826f0d Merge pull request 'hotfix/1211bug' (#37) from hotfix/1211bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/37
4 years ago
tping 24fcfc4b90 公会信息 4 years ago
张谷成 a7553cf116 Merge pull request '1' (#36) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/36
4 years ago
tping 1dbc61a602 1 4 years ago
tping 0f7b23ad57 1 4 years ago
张谷成 0c7e4b2d30 Merge pull request 'hotfix/1211bug' (#35) from hotfix/1211bug into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
4 years ago
tping 858e929199 甲乙方公司 4 years ago
tping 304c59be10 甲乙方公司 4 years ago
tping 08df25eab3 展示错误 4 years ago
tping d6f34127df 1 4 years ago