elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,773 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

7773 Commits (d082a7dc986e3d050cbdc9815b2c9b4f0ed4a8e1)
 

Author SHA1 Message Date
zhengyongxing f855835501 12.28功能提交
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
郑永星 444cff5f64 Merge pull request '12.28功能提交' () from feature/add_item into release 
12.28功能提交
zhengyongxing d1b0ec55a8 12.28功能提交
郑永星 1496fa349a Merge pull request '12.28功能提交' () from feature/add_item into release 
12.28功能提交
zhengyongxing 0293fd7ff1 12.28功能提交
chenzhi f0829e84cc 优化统计
zhengyongxing bb73235874 12.28功能提交
郑永星 12434fb840 Merge pull request 'feature/add_item' () from feature/add_item into release 
12.28功能提交
chenzhi be8a30a2e8 合并
chenzhi b1a34cc9a0 优化不打款汇总
zhengyongxing e84ce56293 12.28功能提交
chenzhi 19f7406298 优化结算
万盟天下 459026d842 Merge pull request '修改bug' () from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/49
ELF a70bffaee3 修改bug
万盟天下 4917d4806f Merge pull request '调试bug' () from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/48
ELF 4f4929ad72 修改
万盟天下 9ded6cb0bd Merge pull request '剑仙诀添加资源发放接口' () from feature/leniu_testing_resource into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/47
chenzhi 6aeb73b759 优化财务汇总
ELF 932a082134 剑仙诀添加资源发放接口
chenzhi 90de336434 优化数据
zhengyongxing 08d235c03a 12.28功能提交
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
chenzhi b6c87bfefe 优化首页
廖金灵 599312e809 Merge pull request '紧急需求12.28' () from release into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/45
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
郑永星 cd2d9b3bc2 Merge pull request '12.28功能提交' () from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44
zhengyongxing e0f17ea195 12.28功能提交
chenzhi 0e54b1c376 优化渠道和测试服订单
郑永星 11c7c542f8 Merge pull request '12.28功能提交' () from feature/update_payment into release 
12.28功能提交
zhengyongxing d0ee96f7b5 12.28功能提交
郑永星 db487f1033 Merge pull request 'feature/update_payment' () from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/42
zhengyongxing ac70fd3f79 12.28功能提交
zhengyongxing f4027b75b3 12.28功能提交
zhengyongxing eb8478fbb7 12.28功能提交
郑永星 21f957f46f Merge pull request '12.28功能提交' () from feature/update_payment into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/41
zhengyongxing 08153a8359 12.28功能提交
郑永星 ad7dc1f46d Merge pull request 'feature/update_payment' () from feature/update_payment into release 
12.28功能提交
zhengyongxing ffa78964ec 12.28功能提交
zhengyongxing 29e8421266 12.28功能提交
zhengyongxing 4f2f18ad91 12.28功能提交
zhengyongxing 82592dd457 12.28功能提交
zhengyongxing c8914800c7 12.28功能提交
zhengyongxing c716535975 12.28功能提交
zhengyongxing 552a6f8181 12.28功能提交
zhengyongxing 6a86a5e76f 12.18功打款能提交
chenzhi 9ab8454970 优化结算汇总
zhengyongxing 8a6191810b 12.18功打款能提交
chenzhi 40005b7177 优化游戏统计
tping ccf0589e4f 导入