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 |
张谷成
|
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 |
|
张谷成
|
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 |
|
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 |
|
chenzhi
|
5b5029d570
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
chenzhi
|
5f0d0a7101
|
优化游戏统计导出
|
4 years ago |
|
chenzhi
|
c5bc21cb36
|
优化游戏导出
|
4 years ago |
|
chenzhi
|
f00ef7fcc9
|
优化导出
|
4 years ago |
|
chenzhi
|
236bd8f538
|
优化财务游戏汇总
|
4 years ago |
|
chenzhi
|
76874cf34a
|
优化游戏统计
|
4 years ago |
|
张谷成
|
91701cc612
|
Merge pull request '公会信息' (#34) from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/34
|
4 years ago |
|
廖金灵
|
feb46d1954
|
Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
|
4 years ago |
|
zhengyongxing
|
87c6c71d0a
|
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
699449a702
|
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
0c49d1d655
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two
|
4 years ago |
|
zhengyongxing
|
c30e396b2c
|
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
32abdbb390
|
汇总统计修改
|
4 years ago |
|
chenzhi
|
fc75b7d81d
|
优化统计
|
4 years ago |
|
chenzhi
|
79588d52e8
|
优化财务汇总
|
4 years ago |
|
chenzhi
|
8ef35174dc
|
优化个人补点
|
4 years ago |
|
chenzhi
|
ad73fe03b3
|
优化上游结算
|
4 years ago |
|
chenzhi
|
419793d91b
|
优化上游结算
|
4 years ago |
|
tping
|
0aef9e3019
|
公会信息
|
4 years ago |
|
chenzhi
|
e6af0fbcd5
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
chenzhi
|
b7cc3ccd77
|
优化权限
|
4 years ago |
|
ELF
|
9f61cdade9
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into release
|
4 years ago |
|
chenzhi
|
3fdc14120f
|
优化首页折线
|
4 years ago |
|
郑永星
|
9d93f9d56f
|
Merge pull request '未结算数据的补充' (#25) from feature/add_item into release
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
77678249bf
|
未结算数据的补充
|
4 years ago |
|
郑永星
|
bbfc5f64b8
|
Merge pull request 'feature/add_item' (#24) from feature/add_item into release
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
84efc4d76d
|
未结算数据的补充
|
4 years ago |
|
郑永星
|
6699ce1045
|
Merge pull request '未结算数据的补充' (#23) from feature/add_item into release
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
f13ee0583c
|
未结算数据的补充
|
4 years ago |
|
chenzhi
|
d08691c13a
|
优化充值列表导出
|
4 years ago |
|
chenzhi
|
29636f2922
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_finance_20201211
|
4 years ago |
|
廖金灵
|
ace44195c5
|
Merge pull request 'hotfix/and_bug' (#22) from hotfix/and_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/22
|
4 years ago |
|
chenzhi
|
78451f0551
|
消除打印信息
|
4 years ago |
|
chenzhi
|
96ead18ff6
|
优化打印
|
4 years ago |
|
chenzhi
|
7abcd38f36
|
解决推广公司bug
|
4 years ago |
|
廖金灵
|
3bedf259a0
|
Merge pull request 'feature/1211' (#21) from feature/1211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/21
|
4 years ago |
陈志
|
7286e3d157
|
Merge pull request 'hotfix/and_bug' (#20) from hotfix/and_bug into release
优化下游推广公司搜索
|
4 years ago |
|
chenzhi
|
fb798e82bf
|
优化下游推广公司搜索
|
4 years ago |
|
tping
|
e4ef55531a
|
特殊公司评级管理权限
|
4 years ago |