chenzhi
|
bae615bac0
|
优化子站行为日志
|
4 years ago |
|
chenzhi
|
6c9ae2332b
|
优化管理员添加
|
4 years ago |
|
chenzhi
|
bea2fa7003
|
优化管理组子站点功能
|
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 |
|
chenzhi
|
2a168fb907
|
优化子站登陆所需函数
|
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 |
|
郑永星
|
841e875e40
|
Merge pull request '结算单编辑功能负数可编辑' (#228) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/228
|
4 years ago |
|
zhengyongxing
|
d7f13aad93
|
结算单编辑功能负数可编辑
|
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 |
|
zhengyongxing
|
2f9a822583
|
财务子系统bug修改
|
4 years ago |
|
chenzhi
|
4f14228bab
|
优化子站列表
|
4 years ago |
|
chenzhi
|
a03993f251
|
Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
|
4 years ago |
|
chenzhi
|
1b7dae2603
|
优化结算同步
|
4 years ago |
|
chenzhi
|
c21b9f619e
|
新增子站结算
|
4 years ago |
|
zhengyongxing
|
0332b591e8
|
3.22功能提交
|
4 years ago |
|
chenzhi
|
8d871290f2
|
优化默认公司
|
4 years ago |
|
zhengyongxing
|
eb8c9cebc1
|
3.22好功能提交
|
4 years ago |
|
chenzhi
|
50363297e8
|
优化订单数据换绑
|
4 years ago |
|
chenzhi
|
f670c7196a
|
优化提示
|
4 years ago |
|
chenzhi
|
6790ab5fd3
|
新增订单重算及固化
|
4 years ago |
|
chenzhi
|
1de381bccd
|
优化是否结算
|
4 years ago |
|
chenzhi
|
bb10181cc5
|
新增子站游戏订单及导出
|
4 years ago |
|
chenzhi
|
8b98460242
|
新增备注
|
4 years ago |
|
chenzhi
|
17cee767b7
|
子站同步脚本
|
4 years ago |
|
chenzhi
|
59d1e31119
|
优化退款可以负数
|
4 years ago |
|
chenzhi
|
7ed2855dc5
|
优化重算
|
4 years ago |
|
chenzhi
|
e7a51c41da
|
优化前端入口文件
|
4 years ago |
|
chenzhi
|
5f3c726a05
|
优化游戏统计合计
|
4 years ago |
|
chenzhi
|
243dce02ca
|
优化聚合万盟数据
|
4 years ago |
|
chenzhi
|
aa99f1f668
|
新增审核撤回
|
4 years ago |
|
chenzhi
|
88d02f7be1
|
优化导出提醒-zyx
|
4 years ago |
|
廖金灵
|
a429003fa9
|
Merge pull request '财务子系统bug修复' (#198) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/198
|
4 years ago |
|
zhengyongxing
|
3900a4081a
|
财务子系统bug修复
|
4 years ago |
|
zhengyongxing
|
ae3ad391fd
|
新功能开发
|
4 years ago |
|
廖金灵
|
96c6a47dd5
|
Merge pull request '热更修复' (#197) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/197
|
4 years ago |
|
zhengyongxing
|
a84a69fd56
|
热更修复
|
4 years ago |
|
廖金灵
|
e9507ddb95
|
Merge pull request '热更修复汇总上游时间错误' (#194) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/194
|
4 years ago |
|
zhengyongxing
|
55c75e159c
|
热更修复
|
4 years ago |
|
廖金灵
|
df747704ba
|
Merge pull request '2.28号功能提交' (#193) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/193
|
4 years ago |
|
zhengyongxing
|
55ffc36a10
|
2.28号功能提交
|
4 years ago |
|
廖金灵
|
bd20d4a770
|
Merge pull request '2.28号功能提交' (#192) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/192
|
4 years ago |
|
zhengyongxing
|
4aa569d092
|
2.28号功能提交
|
4 years ago |
|
陈志
|
f328397807
|
Merge pull request 'feature/finance_payment_20210115' (#190) from feature/finance_payment_20210115 into release
优化连接
|
4 years ago |
|
chenzhi
|
75850db849
|
优化测试
|
4 years ago |
|
chenzhi
|
0a0ee66012
|
优化连接
|
4 years ago |
|
chenzhi
|
cc59050261
|
优化权限添加
|
4 years ago |
|
陈志
|
a26b10ab2c
|
Merge pull request 'feature/finance_payment_20210115' (#188) from feature/finance_payment_20210115 into release
优化上游
|
4 years ago |
|
chenzhi
|
a33ea0d575
|
优化上游
|
4 years ago |
|
chenzhi
|
e8dea24f46
|
新增周结
|
4 years ago |
|
陈志
|
a85ae5125c
|
Merge pull request '优化子站平台币充值区分万盟' (#187) from feature/finance_payment_20210115 into release
优化子站平台币充值区分万盟
|
4 years ago |