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

2020 Commits (746388dd00a1804493e0c29d39d61627c4e4568f)

Author SHA1 Message Date
chenzhi b19853edd3 优化菜单
chenzhi 13d0c6fa59 优化首页提醒
chenzhi 2658c50c3a 新增测试资源统计
zhengyongxing b073f3e8cd 特殊补点编辑修改
zhengyongxing fecb58efdd 特殊补点编辑修改
tping 8897a87342 甲乙方公司
廖金灵 54266852cc Merge pull request 'feature/more_finance_20201211' () from feature/more_finance_20201211 into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/67
chenzhi 12f4cda850 优化商户筛选
张谷成 83148cd777 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/63
tping 9f329b7c34 优化
张谷成 049f08af72 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
tping e3f020965d 优化
张谷成 5de3b95d54 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
tping b4c3b64fb0 优化
张谷成 2123ad9ef4 Merge pull request '优化' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
tping e57a5f8e50 优化
chenzhi 7ccf5e5857 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
郑永星 1496fa349a Merge pull request '12.28功能提交' () from feature/add_item into release 
12.28功能提交
zhengyongxing 0293fd7ff1 12.28功能提交
郑永星 12434fb840 Merge pull request 'feature/add_item' () from feature/add_item into release 
12.28功能提交
chenzhi be8a30a2e8 合并
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
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
chenzhi 0e54b1c376 优化渠道和测试服订单
郑永星 ad7dc1f46d Merge pull request 'feature/update_payment' () from feature/update_payment into release 
12.28功能提交
zhengyongxing ffa78964ec 12.28功能提交
zhengyongxing 4f2f18ad91 12.28功能提交
zhengyongxing c716535975 12.28功能提交
chenzhi 9ab8454970 优化结算汇总
zhengyongxing 8a6191810b 12.18功打款能提交
tping 824b7b3f06 公会信息导入导出
zhengyongxing 7c4e0e7521 12.18功能提交
zhengyongxing 8430fa1813 12.18功能提交
张谷成 e669d1bc38 Merge pull request '刷新' () from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/38
tping 6e63176176 刷新
tping 24fcfc4b90 公会信息
张谷成 a7553cf116 Merge pull request '1' () from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/36
tping 1dbc61a602 1
tping 0f7b23ad57 1
张谷成 0c7e4b2d30 Merge pull request 'hotfix/1211bug' () from hotfix/1211bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
tping 858e929199 甲乙方公司
tping 304c59be10 甲乙方公司
tping 08df25eab3 展示错误
chenzhi 5b5029d570 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
chenzhi 5f0d0a7101 优化游戏统计导出
chenzhi c5bc21cb36 优化游戏导出
张谷成 91701cc612 Merge pull request '公会信息' () from feature/1228zgc into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
zhengyongxing 87c6c71d0a 汇总bug修改
zhengyongxing 699449a702 未结算数据的补充
zhengyongxing 0c49d1d655 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two