chenzhi
|
a9951bd657
|
优化保存
|
4 years ago |
chenzhi
|
30d6f53582
|
优化渠道计算
|
4 years ago |
chenzhi
|
bb2656f207
|
优化代码
|
4 years ago |
chenzhi
|
844a6d501e
|
新增打款账号编辑
|
4 years ago |
廖金灵
|
84c6612093
|
Merge pull request 'bug修复' (#310) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/310
|
4 years ago |
zhengyongxing
|
cd1fd63681
|
bug修复
|
4 years ago |
ELF
|
c1a71bd5f1
|
Merge branch 'master' into release
|
4 years ago |
廖金灵
|
a9fd28e38f
|
Merge pull request 'feature/add_item' (#294) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/294
|
4 years ago |
zhengyongxing
|
b7d4e9002d
|
4.23号功能提交
|
4 years ago |
郑永星
|
d1b570be2a
|
Merge pull request '4.23号功能提交' (#293) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/293
|
4 years ago |
zhengyongxing
|
83cc2aa6ec
|
4.23号功能提交
|
4 years ago |
陈志
|
34fcfc7675
|
Merge pull request 'hotfix/fiance_statement_bug_20210420' (#292) from hotfix/fiance_statement_bug_20210420 into release
优化关联
|
4 years ago |
chenzhi
|
b257ee8754
|
优化游戏关联
|
4 years ago |
郑永星
|
b79f567e0a
|
Merge pull request '4.23号功能提交' (#291) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/291
|
4 years ago |
zhengyongxing
|
1a2f0ab975
|
4.23号功能提交
|
4 years ago |
郑永星
|
49a4caaba6
|
Merge pull request '4.23号功能提交' (#288) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/288
|
4 years ago |
zhengyongxing
|
671419882f
|
4.23号功能提交
|
4 years ago |
chenzhi
|
aa0bcef724
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
|
4 years ago |
廖金灵
|
56e28d216e
|
Merge pull request '版本更新' (#285) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/285
|
4 years ago |
郑永星
|
9f5463dd3d
|
Merge pull request '4.22号功能提交' (#283) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/283
|
4 years ago |
zhengyongxing
|
d314e6164a
|
4.22号功能提交
|
4 years ago |
chenzhi
|
4dd36afd45
|
优化icon大小限制
|
4 years ago |
chenzhi
|
d5a8c97ad3
|
优化图片上传
|
4 years ago |
chenzhi
|
b71995aeeb
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
|
4 years ago |
廖金灵
|
8375c5f9bd
|
Merge pull request '优化独立减罚' (#280) from hotfix/fiance_statement_bug_20210420 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/280
|
4 years ago |
chenzhi
|
c575d4f590
|
优化独立减罚
|
4 years ago |
郑永星
|
d082a7dc98
|
Merge pull request '4.22号功能提交' (#277) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/277
|
4 years ago |
zhengyongxing
|
8fb73e6fed
|
4.22号功能提交
|
4 years ago |
ELF
|
bfa0c5c5b8
|
迁移优化
|
4 years ago |
陈志
|
6d03ea4942
|
Merge pull request 'feature/finance_payment_20210115' (#276) from feature/finance_payment_20210115 into release
新增退款统计
|
4 years ago |
chenzhi
|
06202851c2
|
新增退款统计
|
4 years ago |
chenzhi
|
f349603e7c
|
新增游戏订单退款
|
4 years ago |
郑永星
|
80fe58ee20
|
Merge pull request 'feature/add_item' (#275) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/275
|
4 years ago |
zhengyongxing
|
9080d521fd
|
4.22号功能提交
|
4 years ago |
liyang
|
f32d51480f
|
玩家列表修改
|
4 years ago |
廖金灵
|
f5566264d9
|
Merge pull request '特殊补点bug修改' (#272) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/272
|
4 years ago |
zhengyongxing
|
72077477ed
|
特殊补点bug修改
|
4 years ago |
chenzhi
|
c0f98f71a5
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
zhengyongxing
|
65e0fda02f
|
工会统计bug修正
|
4 years ago |
chenzhi
|
4166112252
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
zhengyongxing
|
a48f0214c7
|
归属游戏上传
|
4 years ago |
chenzhi
|
53ae4b0f0e
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
chenzhi
|
6d92d9e21c
|
优化菜单操作
|
4 years ago |
chenzhi
|
17945097ce
|
优化导出
|
4 years ago |
chenzhi
|
a327627f85
|
优化行为日志导出
|
4 years ago |
chenzhi
|
bae615bac0
|
优化子站行为日志
|
4 years ago |
chenzhi
|
6c9ae2332b
|
优化管理员添加
|
4 years ago |
zhengyongxing
|
99d281b8e1
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
c772aa6854
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
c1c0e3ac14
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
0d5ab01f32
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
860d389700
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
f675357a2d
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
cddf09db60
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
eda3c9bbe4
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
110e5001ee
|
商务汇总修改
|
4 years ago |
zhengyongxing
|
859fce06c4
|
商务奖金功能修改
|
4 years ago |
zhengyongxing
|
7178181ebb
|
财务打款系统bug修复
|
4 years ago |
chenzhi
|
2ad1ff5434
|
优化加入组别
|
4 years ago |
chenzhi
|
7355546a58
|
优化新增用户组
|
4 years ago |
zhengyongxing
|
01a0d7c717
|
财务打款系统bug修复
|
4 years ago |
zhengyongxing
|
f474095a24
|
Merge branches 'feature/add_item' and 'release' of 8.136.139.249:wmtx/platform into feature/add_item_new
Conflicts:
Application/Admin/Controller/GameController.class.php
|
4 years ago |
zhengyongxing
|
619d9d547e
|
商务奖金功能上传
|
4 years ago |
chenzhi
|
8f7405bb17
|
优化权限
|
4 years ago |
ELF
|
d7d78e748d
|
修改跨区bug
|
4 years ago |
chenzhi
|
5ea5bb2eaa
|
优化子站登陆
|
4 years ago |
廖金灵
|
69301ee537
|
Merge pull request '优化子站上游比例按实际结算' (#240) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/240
|
4 years ago |
chenzhi
|
6c3aefcf55
|
优化子站上游比例按实际结算
|
4 years ago |
tping
|
9d478c0bc7
|
1
|
4 years ago |
廖金灵
|
64a4923564
|
Merge pull request '财务打款系统bug修复' (#237) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/237
|
4 years ago |
zhengyongxing
|
2892562b2c
|
财务打款系统bug修复
|
4 years ago |
chenzhi
|
96f832322c
|
Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
chenzhi
|
3b447b70d0
|
优化公会统计
|
4 years ago |
chenzhi
|
7ca675b520
|
优化推广员统计
|
4 years ago |
chenzhi
|
6c46dd0ea5
|
优化汇总
|
4 years ago |
chenzhi
|
abb88719b5
|
新增表同步
|
4 years ago |
ELF
|
5bf8961f14
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server
|
4 years ago |
ELF
|
8dee426c5f
|
优化
|
4 years ago |
郑永星
|
77532bdb08
|
Merge pull request 'feature/add_item' (#230) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/230
|
4 years ago |
zhengyongxing
|
97fae33c43
|
公会信息功能提交
|
4 years ago |
zhengyongxing
|
f69b0ddf14
|
公会信息功能提交
|
4 years ago |
chenzhi
|
57abd846c6
|
新增财务汇总重算
|
4 years ago |
廖金灵
|
7f3f3997fd
|
Merge pull request 'feature/LY0309' (#224) from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/224
|
4 years ago |
郑永星
|
d24d98d11d
|
Merge pull request '市场业绩bug修复' (#227) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/227
|
4 years ago |
zhengyongxing
|
22b17c5010
|
市场业绩系统bug修复
|
4 years ago |
zhengyongxing
|
c06b954bf7
|
市场业绩bug修复
|
4 years ago |
郑永星
|
5fea16b821
|
Merge pull request '市场业绩bug修正' (#226) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/226
|
4 years ago |
zhengyongxing
|
7c60d8321b
|
市场业绩bug修正
|
4 years ago |
liyang
|
a457750390
|
角色查询、额外额度、测试资源权限修改
|
4 years ago |
廖金灵
|
2690db95ab
|
Merge pull request 'feature/finance_payment_20210115' (#223) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/223
|
4 years ago |
郑永星
|
6051f9ee2a
|
Merge pull request '子系统上游修正' (#222) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/222
|
4 years ago |
chenzhi
|
b19d73388b
|
子站游戏订单bug
|
4 years ago |
zhengyongxing
|
68c873983b
|
子系统上游修正
|
4 years ago |
chenzhi
|
ce90ddf3ad
|
优化推广员统计
|
4 years ago |
廖金灵
|
8e571e0808
|
Merge pull request 'feature/finance_payment_20210115' (#219) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/219
|
4 years ago |
chenzhi
|
c91206c176
|
优化推广员统计
|
4 years ago |
chenzhi
|
7c460cdb47
|
优化支付导出
|
4 years ago |
陈志
|
b4277c2276
|
Merge pull request '优化订单换绑到江息' (#217) from feature/finance_payment_20210115 into release
优化订单换绑到江息
|
4 years ago |
chenzhi
|
c2303a0676
|
优化订单换绑到江息
|
4 years ago |
郑永星
|
c754037b79
|
Merge pull request '财务子系统bug修改' (#216) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/216
|
4 years ago |