yulingwei
|
9e1f74480b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
b9bc2a7162
|
更新
|
5 years ago |
zhengyongxing
|
6fcdfd2f31
|
用户导出
|
5 years ago |
|
zhengyongxing
|
d45000e3cd
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengyongxing
|
777352f1bf
|
平台币充值bug
|
5 years ago |
sunke
|
96bf61ada0
|
冲值玩家promoteid
|
5 years ago |
|
yulingwei
|
e622b0a81e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
1966e0a2e8
|
更新
|
5 years ago |
|
zhengyongxing
|
fc126c0bbf
|
平台币充值bug
|
5 years ago |
|
zhengyongxing
|
d6b50146ae
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
chenxiaojun
|
945250b01a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengyongxing
|
fb6177d187
|
平台币充值bug
|
5 years ago |
|
chenxiaojun
|
e49bce3deb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenxiaojun
|
b27e7e3854
|
更新
|
5 years ago |
|
sunke
|
02ea000f2a
|
charge
|
5 years ago |
|
chenxiaojun
|
ee095e3068
|
推广平台->游戏管理->充值玩家--调整
|
5 years ago |
zhengchanglong
|
965ad46dce
|
充值汇总导出BUG修复
|
5 years ago |
|
zhengyongxing
|
c1c4fbd0fa
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
7a873a9d98
|
平台币发放bug修正
|
5 years ago |
zhanglingsheng
|
668e4d097c
|
推广员oa关联
|
5 years ago |
|
zhanglingsheng
|
a316c4f7f4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
4915ebc70c
|
推广员oa关联
|
5 years ago |
|
yulingwei
|
077ba7754f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
ee7bb128c0
|
修复
|
5 years ago |
|
zhanglingsheng
|
afbd1b6bd5
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
dcd9791f79
|
推广员oa关联
|
5 years ago |
|
zhengyongxing
|
ee65c37cb1
|
用户筛选条件修正
|
5 years ago |
|
zhanglingsheng
|
9c89f1bcd3
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
e59352edbf
|
推广员oa关联
|
5 years ago |
|
chenxiaojun
|
774196dde5
|
推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整
|
5 years ago |
|
chenxiaojun
|
46f1ac0807
|
推广平台->游戏管理->充值玩家--调整
自动脚本->玩家角色充值数据统计--调整
|
5 years ago |
|
zhanglingsheng
|
3002dc113a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
988bf99086
|
ss
|
5 years ago |
|
zhengyongxing
|
6e151dd8a4
|
用户导出修改
|
5 years ago |
|
sunke
|
b305069da9
|
游戏选择
|
5 years ago |
|
zhengyongxing
|
30b5e6ed46
|
用户玩家列表导出优化
|
5 years ago |
|
zhanglingsheng
|
391eed0b78
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
c4e2d0a245
|
推广员OA关联
|
5 years ago |
|
yulingwei
|
9a3bb4e170
|
修复排序问题
|
5 years ago |
|
yulingwei
|
b1902e5592
|
更新
|
5 years ago |
|
yulingwei
|
2e97dff779
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
466dd6cc93
|
upt
|
5 years ago |
|
zhengyongxing
|
c73ce833f4
|
用户导出修正
|
5 years ago |
|
chenxiaojun
|
d6a2e7d120
|
推广平台->游戏管理->游戏详情--样式调整
|
5 years ago |
|
chenxiaojun
|
e6210336c8
|
推广平台->游戏管理->游戏详情--样式调整
|
5 years ago |
|
chenxiaojun
|
840dc085a4
|
推广平台->游戏管理->游戏详情--样式调整
|
5 years ago |
|
chenxiaojun
|
5d5c2a68c6
|
推广平台->游戏管理->游戏详情--样式调整
|
5 years ago |
|
chenxiaojun
|
bad1165ffa
|
推广平台->游戏管理->游戏详情--样式调整
|
5 years ago |
|
chenxiaojun
|
9374e66840
|
推广平台->游戏管理->游戏详情--样式调整
|
5 years ago |
|
sunke
|
1d2ce27736
|
登陆日志排除下线日志
|
5 years ago |
|
sunke
|
0879762b70
|
平台注释
|
5 years ago |
|
sunke
|
8d7640d152
|
充值平台
|
5 years ago |
|
chenxiaojun
|
930a2dc62f
|
推广平台-数据管理->角色查询|充值玩家|团队/推广员业绩--检索更新
|
5 years ago |
|
chenxiaojun
|
585057f98e
|
推广平台-数据管理->角色查询|充值玩家|团队/推广员业绩--检索更新
|
5 years ago |
|
zhengyongxing
|
cc4a071194
|
用户信息大数据量导出错误
|
5 years ago |
|
chenxiaojun
|
ff77638001
|
推广平台->管理中心->编辑--样式调整
|
5 years ago |
|
chenxiaojun
|
3cfe2c163d
|
推广平台->管理中心->编辑--样式调整
|
5 years ago |
|
chenxiaojun
|
5c264a7e08
|
推广平台->管理中心->编辑--样式调整
|
5 years ago |
|
chenxiaojun
|
e35ada1a5d
|
推广平台->管理中心->编辑--样式调整
|
5 years ago |
chenzhi
|
b52113622d
|
[bug]无法获取上线推广员问题
|
5 years ago |
|
chenxiaojun
|
b835f96024
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
3a867f60e3
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
c05f962a43
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
30d9c30522
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
7f796a3e3a
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
3d3bfce947
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
“用lww
|
af130fd638
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
“用lww
|
f75188f952
|
后台导出功能增加内存限制到512M
|
5 years ago |
|
chenxiaojun
|
70ee46ab2b
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
855e943ccb
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
05d006d533
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
chenxiaojun
|
f2c8986cd7
|
自动脚本->玩家角色充值数据统计
|
5 years ago |
|
“用lww
|
e1b93a987b
|
导出数据过大，配置加大内存限制范围
|
5 years ago |
|
yulingwei
|
4071341458
|
更新
|
5 years ago |
|
yulingwei
|
090d1e2f69
|
更新bug
|
5 years ago |
tpingzhang
|
a0ab440e1a
|
后台防沉迷配置
|
5 years ago |
|
tpingzhang
|
e8f6e310d1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
f9307ee710
|
后台防沉迷配置
|
5 years ago |
|
chenzhi
|
d8fcaf59c5
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
8bb10aea61
|
[bug]玩家列表累计充值
|
5 years ago |
|
tpingzhang
|
a77b6d8f04
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
704dd789eb
|
后台防沉迷配置
|
5 years ago |
|
sunke
|
3cb2f2b479
|
arpu名词说明
|
5 years ago |
|
tpingzhang
|
da794baa96
|
配置写到数据库
|
5 years ago |
|
tpingzhang
|
d176d51c5c
|
配置写到数据库
|
5 years ago |
 elf@home
|
dc6790b404
|
修改
|
5 years ago |
|
sunke
|
2437d613bb
|
bug
|
5 years ago |
|
yulingwei
|
3e423b1372
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
342ec9130e
|
修改
|
5 years ago |
|
sunke
|
08707939d5
|
表格字段顺序问题
|
5 years ago |
|
ELF
|
4cfa9c387f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
ef6b83c867
|
修改bug
|
5 years ago |
|
chenzhi
|
b93b2c59ce
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
c76e0620b7
|
[优化 ]新增历史累计充值记录
|
5 years ago |
|
ELF
|
6696889ecb
|
修改bug
|
5 years ago |
|
ELF
|
2f885bcf3e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
200d9e8667
|
修改bug
|
5 years ago |
|
zhengyongxing
|
abdf68a91c
|
收回绑币玩家账号select框改为input框
|
5 years ago |
|
zhengchanglong
|
c6e6f1e713
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
“用lww
|
4a73f4668d
|
手机官网-落地页回滚
|
5 years ago |
|
yulingwei
|
485e3930f9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
12362190e6
|
upt
|
5 years ago |
|
chenzhi
|
6b7f65be25
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
86b53d375c
|
[新增]玩家列表汇总统计
|
5 years ago |
|
sunke
|
94728492e9
|
时间修改
|
5 years ago |
|
zhengchanglong
|
b54f33ea98
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
chenxiaojun
|
77574b4d37
|
推广平台->数据管理->每日概况|数据汇总--更新
|
5 years ago |
|
chenxiaojun
|
efb4a771b0
|
推广平台->数据管理->每日概况|数据汇总--更新
|
5 years ago |
|
chenzhi
|
0ca7d2f5d2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
ea580a52fe
|
隐藏推广员统计的二级页
|
5 years ago |
|
zhengyongxing
|
12a729444a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
ae18f1fb24
|
推广员统计修改
|
5 years ago |
|
sunke
|
9bc0d3516e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
0b0984d266
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
b7dd9edaa9
|
[优化]玩家列表累记充值统计
|
5 years ago |
|
sunke
|
21ad2f0341
|
提现状态
|
5 years ago |
|
“用lww
|
3180406491
|
pc官网-公司logo可点击跳首页
|
5 years ago |
|
chenxiaojun
|
0c41644d7a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenxiaojun
|
57709068fa
|
推广平台->财务管理->提现记录--添加撤销提现
|
5 years ago |
|
zhengchanglong
|
b602142a81
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
chenxiaojun
|
ca2935763b
|
推广平台->财务管理->提现记录--添加撤销提现
|
5 years ago |
|
“用lww
|
1b2a9c7f9b
|
pc官网修改
|
5 years ago |
|
“用lww
|
595c64e831
|
pc官网修改
|
5 years ago |
|
zhengyongxing
|
8e18e8faac
|
推广员统计官方渠道添加
|
5 years ago |
|
sunke
|
1ccf59fa26
|
提现明细状态说明
|
5 years ago |
|
zhengchanglong
|
1ae5fa0f20
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
sunke
|
63dc4a15d8
|
导出状态修改
|
5 years ago |
|
“用lww
|
6e1db7caa6
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
“用lww
|
0168a52b68
|
手机官网-页面更改
|
5 years ago |
|
chenxiaojun
|
4a4a6501ce
|
分成比例
|
5 years ago |
|
chenxiaojun
|
e0c0f50c7d
|
分成比例
|
5 years ago |
|
chenxiaojun
|
5fcad13fce
|
根据时间统计玩家充值
|
5 years ago |
|
chenxiaojun
|
2123b29479
|
根据时间统计玩家充值
|
5 years ago |
|
chenzhi
|
df9d1415df
|
[修复]推广员充值统计无promote_id问题
|
5 years ago |
|
sunke
|
0983eb633c
|
设备号
|
5 years ago |
|
sunke
|
b1a870d773
|
排序
|
5 years ago |
|
sunke
|
36ff63bb33
|
角色查询
|
5 years ago |
|
chenxiaojun
|
98fe853743
|
推广平台->数据管理--更新
|
5 years ago |
|
chenxiaojun
|
80f76c4490
|
推广平台->数据管理--更新
|
5 years ago |
|
sunke
|
623bc0d44f
|
充值
|
5 years ago |
|
chenxiaojun
|
67864f82a0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenxiaojun
|
a2dc77645f
|
推广平台->数据管理--更新
|
5 years ago |
|
zhengyongxing
|
0b05701798
|
推广员首页统计修改
|
5 years ago |
|
sunke
|
750cefcb54
|
充值
|
5 years ago |
|
ELF
|
d70bf7bf42
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
0d91f0aa5c
|
修改bug
|
5 years ago |
|
chenxiaojun
|
391b997f18
|
推广平台->财务管理->提现记录--增加重新审核
|
5 years ago |
|
chenxiaojun
|
bd6932d8d4
|
推广平台->财务管理->提现记录--增加重新审核
|
5 years ago |
|
ELF
|
ef9cb4e2c4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
710d7028f1
|
修改
|
5 years ago |
|
chenxiaojun
|
85eeed62f0
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
638a206ad6
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
yulingwei
|
8fee02fc4c
|
修改时间
|
5 years ago |
|
chenxiaojun
|
2a93ed6ec2
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e24550b993
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e8dfa6f92e
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
c923a58536
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
9b51fd6145
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e7f9d1b6f3
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
sunke
|
ef1857d752
|
bug
|
5 years ago |
|
chenzhi
|
8007d9954f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
849fd77ac6
|
优化推广员统计的方法
|
5 years ago |
|
ELF
|
3ad71f99bf
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
112d7462bc
|
修改bug
|
5 years ago |
|
chenxiaojun
|
950bd81e5e
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
47af5037b7
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
zhengyongxing
|
3cabc6ab95
|
注册修改
|
5 years ago |
|
zhengyongxing
|
d7550495b1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
6c2c048952
|
普通注册密码规则修改
|
5 years ago |
|
chenxiaojun
|
4342e240c0
|
推广平台->数据汇总->充值玩家--添加排序功能
|
5 years ago |
|
chenxiaojun
|
1a110770dc
|
推广平台->数据汇总->充值玩家--添加排序功能
|
5 years ago |
|
ELF
|
1c2458841d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
5a98b86a07
|
修改bug
|
5 years ago |
|
zhengyongxing
|
be09214f7a
|
登录sdk主页跳转
|
5 years ago |
|
zhengyongxing
|
479a7537a8
|
登录sdk主页跳转
|
5 years ago |
|
zhengyongxing
|
ee40286108
|
登录sdk主页跳转
|
5 years ago |
|
zhengchanglong
|
4120344388
|
超级签下载页无礼包不显示礼包特权
|
5 years ago |
|
zhengchanglong
|
7e01b0208c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
7265a2961e
|
超级签页面UI修改
|
5 years ago |
|
chenxiaojun
|
3e68880ac0
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
09ab8bf8ad
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0571347aeb
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
chenxiaojun
|
d9659ea975
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
a53970efcf
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
49270427ee
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
zhengchanglong
|
c63873c171
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
1ed48003ac
|
超级签充值BUG修复
|
5 years ago |
|
sunke
|
bf3f7f70fa
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
sunke
|
1e090fc6dd
|
时间格式
|
5 years ago |
|
yulingwei
|
0e1abdfa94
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
feecf9199d
|
电子邮箱改为选填
|
5 years ago |
|
sunke
|
7220083d84
|
公告
|
5 years ago |
|
zhengyongxing
|
66776fef98
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
89b67c06a4
|
登录sdk，跳转至购买超级签，无需重新登陆
|
5 years ago |
|
ELF
|
809191e0f2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
e2a2a07f03
|
修改bug
|
5 years ago |
|
sunke
|
a87eca6363
|
创建时间
|
5 years ago |
|
sunke
|
7610314927
|
数据管理
|
5 years ago |
|
zhengchanglong
|
d191552c1f
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
ddacae349e
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
chenzhi
|
8af46f08c2
|
优化推广员统计1
|
5 years ago |
|
zhengchanglong
|
387be649de
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
256545a59a
|
123
|
5 years ago |
|
“用lww
|
019ae56f40
|
手机官网-落地页
|
5 years ago |
|
zhengyongxing
|
5c97bb7610
|
数据分析bug修正
|
5 years ago |
|
zhengyongxing
|
db40381bb1
|
定时器接口时间区间修正
|
5 years ago |
|
sunke
|
401edecd61
|
target_level
|
5 years ago |
|
“用lww
|
07a33ab051
|
手机官网-落地页
|
5 years ago |
|
sunke
|
5241f98c68
|
平台币转移
|
5 years ago |
|
zhengyongxing
|
4f27c2fb29
|
统计bug修正
|
5 years ago |
|
zhengchanglong
|
b7fdcf38f6
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
d230f0e047
|
Merge branch 'dev_zyx' into dev_zcl
|
5 years ago |
|
zhengyongxing
|
08b2ba432a
|
统计数据修正
|
5 years ago |
|
sunke
|
dd7a55bf38
|
账号修改
|
5 years ago |
|
sunke
|
a770dc14e5
|
安全中心
|
5 years ago |
|
sunke
|
e244b43c92
|
推广员账号
|
5 years ago |
|
zhengchanglong
|
b432423068
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
28ab1af0b8
|
Merge branch 'dev-cz' into dev_zcl
|
5 years ago |
|
chenzhi
|
e9e718abbb
|
同上
|
5 years ago |
|
chenzhi
|
0e72821a89
|
修改推广后台平台币充值手续费费率
|
5 years ago |
|
sunke
|
f4bf575663
|
时间格式
|
5 years ago |
|
“用lww
|
28db83f646
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
sunke
|
bfb236892c
|
提交方式
|
5 years ago |
|
“用lww
|
97543cebb8
|
pc官网-充值页面修改
|
5 years ago |
|
sunke
|
5a83adb06d
|
下载注释
|
5 years ago |
|
sunke
|
193631bbb2
|
大小写问题
|
5 years ago |
|
ELF
|
51d1d730e1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
c0f19228d2
|
修改bug
|
5 years ago |
|
chenxiaojun
|
925d80ac66
|
管理后台->用户->玩家组->角色查询--更新
|
5 years ago |
|
yulingwei
|
26d0d0d6cb
|
merge
|
5 years ago |
|
chenxiaojun
|
0875ed5a9a
|
管理后台->用户->玩家组->角色查询--更新
|
5 years ago |
|
yulingwei
|
a9f06b1d57
|
修改批量锁定问题
|
5 years ago |
|
zhengchanglong
|
36c4e476ea
|
Merge branch 'dev_zcl' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
3f869ccb2e
|
Merge branch 'dev-cz' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
df03c05651
|
修正统计bug
|
5 years ago |
|
zhengyongxing
|
118f706440
|
脚本去除部分输出
|
5 years ago |
|
zhengchanglong
|
15695d5b5d
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Application/Mobile/Controller/SsgController.class.php
|
5 years ago |
|
chenxiaojun
|
0e81ba6401
|
推广平台->数据管理--标题调整
|
5 years ago |
|
chenxiaojun
|
7e0cd3c297
|
推广平台->数据管理--标题调整
|
5 years ago |
|
chenxiaojun
|
21070ac3a4
|
推广平台->财务管理--标题调整
|
5 years ago |
|
chenxiaojun
|
0f5da378fc
|
推广平台->财务管理--标题调整
|
5 years ago |
|
zhengyongxing
|
0edc4452e3
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Application/Mobile/Controller/SsgController.class.php
|
5 years ago |
|
chenzhi
|
2a417c2746
|
123
|
5 years ago |
|
sunke
|
b73472fd9d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
sunke
|
426d8e4fae
|
bug
|
5 years ago |
|
ELF
|
6403bc9859
|
修改
|
5 years ago |
|
ELF
|
d2cb9b9a2b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
0b4416f057
|
修改bug
|
5 years ago |
|
chenzhi
|
e61a8af93d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
313cd11796
|
恢复
|
5 years ago |