chenzhi
|
68f4ffc559
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
chenzhi
|
70aab2f137
|
角色查询新增创角时间区间查询
|
5 years ago |
zhengyongxing
|
fa393d9c90
|
管理后台新增功能添加
|
5 years ago |
liuweiwen
|
563b672c21
|
加提示
|
5 years ago |
|
liuweiwen
|
14258a01a9
|
前端判断上传视频的大小与格式
|
5 years ago |
|
liuweiwen
|
a1bdc4b936
|
提示
|
5 years ago |
|
chenzhi
|
95aa18a928
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
liuweiwen
|
b0748243b9
|
编辑游戏-》上传视频
|
5 years ago |
|
liuweiwen
|
e3fe1cc03f
|
后台管理-》编辑游戏-》上传视频
手机端落地页显示视频
|
5 years ago |
|
chenzhi
|
768c03c78d
|
优化总览导出为前端导出
|
5 years ago |
|
liuweiwen
|
59b1e3149e
|
管理后台-推广公司搜索
|
5 years ago |
|
liuweiwen
|
ecdfd078fc
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
chenzhi
|
48fac5ab4d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
zhengyongxing
|
4df0f91f43
|
管理后台上传图片修改
|
5 years ago |
|
zhengyongxing
|
a074b4a319
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
dce35b6ff1
|
管理后台游戏编辑上传图片限制大小
|
5 years ago |
|
liuweiwen
|
a7c5957201
|
推广公司管理
|
5 years ago |
|
liuweiwen
|
fd7481a940
|
风控管理样式调整
|
5 years ago |
|
liuweiwen
|
93d46b74ae
|
样式调整
|
5 years ago |
|
liuweiwen
|
1693f7fa98
|
推广公司
|
5 years ago |
|
liuweiwen
|
d51725f1af
|
新增推广员时，新增推广所属公司
|
5 years ago |
|
chenzhi
|
25cb177aea
|
新增游戏区服开服预告
|
5 years ago |
|
chenzhi
|
e1c29c73af
|
总览统计结束
|
5 years ago |
 ELF
|
3e7382542d
|
打包区分ios新旧包
|
5 years ago |
|
liuweiwen
|
24ce610949
|
优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】，名词更改 — （游戏详情介绍）改为（游戏简介）
|
5 years ago |
|
chenzhi
|
c178de254b
|
合并dev
|
5 years ago |
|
ELF
|
cf31d4cc57
|
Merge branch 'hotfix/add_bans_type' into dev
|
5 years ago |
yulingwei
|
fa9d40f87a
|
新增风控标识
|
5 years ago |
|
zhengyongxing
|
56d3718c14
|
用户登录记录
|
5 years ago |
|
liuweiwen
|
b764260647
|
后台上传官网附件
|
5 years ago |
chenzhi
|
81e56063c7
|
优化取消补链提示
|
5 years ago |
|
chenzhi
|
d64b627883
|
游戏充值新增文字说明
|
5 years ago |
|
chenzhi
|
ef25027213
|
补链新增切分时间
|
5 years ago |
|
chenzhi
|
dd22e6d0e9
|
修改补链in/out
|
5 years ago |
|
chenzhi
|
831c728cda
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
yulingwei
|
65552a6dae
|
Merge branch 'hotfix/member_lock' into dev
|
5 years ago |
|
yulingwei
|
7a767466ef
|
锁号优化
|
5 years ago |
|
zhengyongxing
|
34d424887d
|
绑定币
|
5 years ago |
|
chenzhi
|
dccfb64957
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
chenzhi
|
76b561810d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
dfff8b6240
|
优化推广员选择
|
5 years ago |
zhanglingsheng
|
ede4cdd96e
|
短信配置
|
5 years ago |
|
zhanglingsheng
|
f595a3346d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
3f8168c11a
|
添加新短信
|
5 years ago |
|
chenzhi
|
8a7c6219ca
|
新需求 充值-游戏充值新增两个字段显示
|
5 years ago |
|
chenzhi
|
44e5ca356a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
chenzhi
|
2d2f3abf75
|
[bug]角色查询 无游戏区服全显示问题
|
5 years ago |
|
chenzhi
|
3500cce032
|
[bug]角色查询 区服不显示
|
5 years ago |
|
chenzhi
|
bb09ef9005
|
[bug]角色查询区服不显示
|
5 years ago |
|
chenzhi
|
e27cdc8a38
|
优化所有统计
|
5 years ago |
|
yulingwei
|
9e1f74480b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
b9bc2a7162
|
更新
|
5 years ago |
|
zhengyongxing
|
777352f1bf
|
平台币充值bug
|
5 years ago |
|
zhengyongxing
|
fb6177d187
|
平台币充值bug
|
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
|
e59352edbf
|
推广员oa关联
|
5 years ago |
|
zhanglingsheng
|
988bf99086
|
ss
|
5 years ago |
|
zhanglingsheng
|
c4e2d0a245
|
推广员OA关联
|
5 years ago |
|
yulingwei
|
4071341458
|
更新
|
5 years ago |
|
yulingwei
|
090d1e2f69
|
更新bug
|
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 |
|
elf@home
|
dc6790b404
|
修改
|
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 |
|
chenzhi
|
b93b2c59ce
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
c76e0620b7
|
[优化 ]新增历史累计充值记录
|
5 years ago |
|
zhengyongxing
|
abdf68a91c
|
收回绑币玩家账号select框改为input框
|
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
|
86b53d375c
|
[新增]玩家列表汇总统计
|
5 years ago |
|
chenzhi
|
ea580a52fe
|
隐藏推广员统计的二级页
|
5 years ago |
|
chenzhi
|
df9d1415df
|
[修复]推广员充值统计无promote_id问题
|
5 years ago |
|
yulingwei
|
8fee02fc4c
|
修改时间
|
5 years ago |
|
chenzhi
|
849fd77ac6
|
优化推广员统计的方法
|
5 years ago |
|
zhengyongxing
|
4f27c2fb29
|
统计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
|
f8008a4b5e
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
64c059cccc
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Data/update.sql
|
5 years ago |
|
yulingwei
|
24d3e6ab07
|
修改bug
|
5 years ago |
|
yulingwei
|
046beee6be
|
修改bug
|
5 years ago |
|
zhengchanglong
|
a4dc55f4e3
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
974a9d93e4
|
Merge branch 'dev-cz' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
2fb1effdcd
|
后台数据分析应用概况优化
|
5 years ago |
|
chenzhi
|
360cf3f3ba
|
优化前端展示
|
5 years ago |
|
chenzhi
|
04c5f17790
|
优化脚本
|
5 years ago |
sunke
|
b64882554a
|
管理后台增加资质审核检索
|
5 years ago |
|
chenzhi
|
37d8f72c6d
|
优化首页展示
|
5 years ago |
|
sunke
|
0b8f3450c6
|
审核后台
|
5 years ago |
|
sunke
|
d2d211737f
|
bug
|
5 years ago |
|
sunke
|
eac235d498
|
身份认证后台
|
5 years ago |
|
chenxiaojun
|
9933463c70
|
管理后台->推广员->财务管理->推广提现--结算详情分页
|
5 years ago |
|
chenxiaojun
|
f9d26bab7c
|
管理后台->推广员->财务管理->推广提现--结算详情分页
|
5 years ago |
|
zhanglingsheng
|
f074ce853b
|
sdk菜单配置修改
|
5 years ago |
|
chenxiaojun
|
5e3cc42bc1
|
管理后台->推广员->推广员编辑--二级密码名词解释更改
|
5 years ago |
|
chenxiaojun
|
cc572ca66e
|
管理后台->推广员->推广员编辑--二级密码名词解释更改
|
5 years ago |
|
zhengyongxing
|
97b9a06e69
|
推广后台bug修正
|
5 years ago |
|
chenxiaojun
|
8ac33bb9e4
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
chenxiaojun
|
fd53997094
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
chenxiaojun
|
6ad8277aa0
|
管理后台--更新
|
5 years ago |
|
chenxiaojun
|
2e7ecfa53c
|
管理后台--更新
|
5 years ago |
|
sunke
|
ee8a954566
|
查看消费记录滚动
|
5 years ago |
|
elf@home
|
06486d458c
|
修改bug
|
5 years ago |
|
chenxiaojun
|
a84ea0e679
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
chenxiaojun
|
55fe6a2c7d
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
chenxiaojun
|
638ceba6cc
|
管理后台->游戏订单->游戏充值--日期检索更新
|
5 years ago |
|
chenxiaojun
|
f473c0abc1
|
管理后台->游戏订单->游戏充值--列表样式调整
|
5 years ago |
|
sunke
|
1f34a3a0ce
|
平台币明细，sdk菜单图片上传
|
5 years ago |
|
yulingwei
|
0d258c1d8d
|
upt
|
5 years ago |
|
yulingwei
|
6ea4c72416
|
修改部分导出报表问题
|
5 years ago |
|
ELF
|
d112a3c7ff
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
e27c5a5266
|
修改bug
|
5 years ago |
|
jbrazz
|
5deb0c2b05
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
jbrazz
|
8a513767dd
|
upt
|
5 years ago |
|
sunke
|
9e2bb1e809
|
安全管理admin后台
|
5 years ago |
|
ELF
|
d9419ae64e
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenxiaojun
|
6307625efc
|
管理后台->推广员->结算管理->推广提现->--更新
|
5 years ago |
|
jbrazz
|
8be3ee9560
|
upt
|
5 years ago |
|
jbrazz
|
31948423e0
|
upt
|
5 years ago |
|
jbrazz
|
20c168a537
|
三级改四级配置
|
5 years ago |
|
ELF
|
6f4ec4ff30
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
chenxiaojun
|
c057c5cf47
|
管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制
|
5 years ago |
|
chenxiaojun
|
578d640524
|
管理后台->推广员->结算管理->推广提现--更新
|
5 years ago |
|
chenxiaojun
|
1c157d78b9
|
管理后台->推广员->结算管理->推广提现->订单详情--更新
|
5 years ago |
|
ELF
|
68d39bb3c9
|
Merge branch 'feature/promote' into dev
|
5 years ago |
|
chenxiaojun
|
0787c976ef
|
管理后台->推广员->结算管理->推广提现--更新
|
5 years ago |
|
chenxiaojun
|
895265a330
|
管理后台->推广员->结算管理->推广提现--更新
|
5 years ago |
|
jbrazz
|
f4a46335ca
|
upt
|
5 years ago |
|
jbrazz
|
380c930686
|
Merge branch 'featurer/ylw_4.0' into dev
|
5 years ago |
|
jbrazz
|
ea4c861559
|
upt
|
5 years ago |
|
zyx
|
97a1b634b9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
0a819757cb
|
测试资源时间bug修正
|
5 years ago |
|
jbrazz
|
0dcb2a2014
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
c9996e071c
|
fix grand_id
|
5 years ago |
|
chenzhi
|
58db110844
|
合并
|
5 years ago |
|
chenzhi
|
115bafc067
|
新增补链日期及取消补链功能
|
5 years ago |
|
ELF
|
831456b333
|
解决冲突
|
5 years ago |
|
jbrazz
|
9300280f78
|
merge feture/ylw
|
5 years ago |
|
jbrazz
|
db1ea1370a
|
upt
|
5 years ago |
|
jbrazz
|
5e9cfb023f
|
uypt
|
5 years ago |
Your Name
|
f642fb2c90
|
游戏充值订单添加CP订单号字段
|
5 years ago |
|
jbrazz
|
74be3407b1
|
upt
|
5 years ago |
|
zyx
|
cbfb286d53
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
5f673b346d
|
月结统计添加部长渠道
|
5 years ago |
|
ELF
|
eb15fc7dfc
|
Merge branch 'feature/pack' into feature/promote
|
5 years ago |
|
jbrazz
|
8a2c99681a
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zyx
|
5eca14b69e
|
Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
c66c35b686
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
68df391d9c
|
upt
|
5 years ago |
|
zhengchanglong
|
2d67812f90
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
266202c06b
|
游戏详情查看导出，按日期分成多个sheet
|
5 years ago |
|
Your Name
|
330216e20e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
51701a485d
|
SDK菜单添加平台选型
|
5 years ago |
|
zyx
|
602e53e82f
|
合并分支dev_zyx财务部分的代码
|
5 years ago |
|
zhengchanglong
|
78e23d19b2
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
8fd435a324
|
月结统计，游戏查看名称修改
|
5 years ago |
|
zhengchanglong
|
e5c834e054
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
4dfec50ba5
|
月结统计修改
|
5 years ago |
|
zhengchanglong
|
879accf9f5
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
f44a11a915
|
月结统计提示语修改
|
5 years ago |
|
chenzhi
|
2a7d4a435c
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
zhengchanglong
|
78846c699f
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
9539b38e86
|
月结统计提示语修改
|
5 years ago |
|
jbrazz
|
48b1cdf66f
|
upt
|
5 years ago |
|
zhengchanglong
|
3c3a13c068
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
cfa33d3e42
|
月结统计提示语修改
|
5 years ago |
|
jbrazz
|
a8125bf377
|
upt
|
5 years ago |
|
zhengchanglong
|
9dd5a34bf7
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
chenzhi
|
50c775a78b
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
f9397efebf
|
修改总流水统计方式
|
5 years ago |
|
zhengchanglong
|
6dcd1549d0
|
Merge branch 'dev_zyx' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zyx
|
5a7432ef40
|
月结统计新增平台比收入字段，将平台币流水改为平台币支出
|
5 years ago |
|
zyx
|
b6080180ab
|
测试资源bug修正
|
5 years ago |
|
jbrazz
|
48de85a3c3
|
upt
|
5 years ago |
|
zhengchanglong
|
2c80186025
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
27e8a0c0b5
|
提示栏文字调整,组长渠道与推广员渠道添加文字提示栏
|
5 years ago |
|
zyx
|
414f471ac1
|
提示栏文字调整
|
5 years ago |
|
zhengchanglong
|
bf24f74d00
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
7167366949
|
提示栏文字调整
|
5 years ago |
|
zyx
|
064a3d0098
|
搜索框样式调整
|
5 years ago |
|
zyx
|
6f77f576d1
|
标签位置调整
|
5 years ago |
|
zyx
|
bbc75a419d
|
bug修正，样式更新
|
5 years ago |
|
zhengchanglong
|
cd70dd7dd8
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
62311eb40d
|
月结统计bug修正
|
5 years ago |
|
zyx
|
515ffa25b9
|
月结统计bug修正
|
5 years ago |
|
Your Name
|
dce059abe5
|
SDK菜单修改
|
5 years ago |
|
Your Name
|
7466b90d13
|
SDK菜单修改
|
5 years ago |
|
Your Name
|
ed3ce2b4b5
|
SDK菜单修改
|
5 years ago |
|
Your Name
|
c3762b420c
|
SDK菜单修改
|
5 years ago |
|
Your Name
|
2569850407
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
c90c397dd9
|
SDK菜单修改
|
5 years ago |
|
zyx
|
2adc07ec4a
|
组长月结统计页面文字修正
|
5 years ago |
|
zyx
|
4803bd4a1b
|
组长月结统计页面修正
|
5 years ago |
|
zhengchanglong
|
e69bc5f459
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
63dff98660
|
月结统计导出bug修正
|
5 years ago |
|
zyx
|
1d59721ee2
|
月结统计导出bug修正
|
5 years ago |
|
zyx
|
b42f621dbc
|
财务管理功能提交
|
5 years ago |
|
zyx
|
ee5dccfaeb
|
财务管理功能代码完善
|
5 years ago |
|
jbrazz
|
b78c6228b0
|
Merge branch 'hotfix/fix_bug' into dev
|
5 years ago |
|
jbrazz
|
d4c7727426
|
upt
|
5 years ago |
|
zyx
|
54a01da982
|
财务管理功能完善
|
5 years ago |
|
zyx
|
fe8a60093f
|
新增渠道模板提交
|
5 years ago |
|
zyx
|
d3de669837
|
'代码合并'
|
5 years ago |
|
jbrazz
|
8859c847f6
|
upt
|
5 years ago |
|
jbrazz
|
459b722c1c
|
upt
|
5 years ago |
|
chenxiaojun
|
3be42d0186
|
管理后台->统计->新增->其他注册统计|官方渠道统计
|
5 years ago |
|
chenxiaojun
|
e247c7dedf
|
管理后台->统计->新增->其他注册统计|官方渠道统计
|
5 years ago |
|
zyx
|
24cdd7086b
|
'合并代码'
|
5 years ago |
|
sunke
|
021673f657
|
图片上传补充
|
5 years ago |
|
sunke
|
692a1bcc11
|
webuploader插件
|
5 years ago |
|
zyx
|
c65aa8d69a
|
财务管理bug修正，导出功能，合作方列表添加
|
5 years ago |
|
zyx
|
224c745ba8
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
112316c395
|
财务管理功能添加
|
5 years ago |
|
chenxiaojun
|
0963c69f4d
|
管理后台->游戏管理->合作方管理->新增批量删除
|
5 years ago |
|
chenxiaojun
|
41d45995b0
|
管理后台->游戏管理->合作方管理更新
|
5 years ago |
|
chenxiaojun
|
dd10535a07
|
管理后台->游戏管理->新增合作方管理
|
5 years ago |
|
chenxiaojun
|
fbe8a764f1
|
管理后台->删除溪谷入口
|
5 years ago |
|
chenxiaojun
|
a04f291471
|
管理后台->删除溪谷入口
|
5 years ago |
|
ELF
|
e4f1ed99f8
|
修改后台登录页
|
5 years ago |
|
ELF
|
437909d53a
|
测试
|
5 years ago |
|
zyx
|
0d35370ade
|
扶持号管理推广员搜索改成下拉选项框，扶持号管理搜索异常修正，去除将text_resource的排序规则改回一般排序
|
5 years ago |
|
zyx
|
7ead67f8cb
|
快捷图标代码修正
|
5 years ago |
|
zyx
|
c6da6fb705
|
首页用户注册充值信息修正
|
5 years ago |
|
jbrazz
|
5527b0bc31
|
Merge branch 'hotfix/promote_query' into dev
|
5 years ago |
|
jbrazz
|
736c0fd432
|
fix
|
5 years ago |
|
zhengchanglong
|
5dbfb59f3f
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
a5899444a7
|
Merge branch 'dev_zyx' into dev
# Conflicts:
# Application/Admin/Controller/TestResourceController.class.php
|
5 years ago |
|
chenzhi
|
2f124bffbb
|
coin_num
|
5 years ago |
|
chenzhi
|
751ab77dc9
|
Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
|
5 years ago |
|
chenzhi
|
e3d9d382d9
|
新增线下充值审核
|
5 years ago |
|
zyx
|
0a9dbe6a78
|
管理后台菜单bug修复
|
5 years ago |
|
zyx
|
c8f101f40c
|
管理后台添加测试资源
|
5 years ago |
|
zyx
|
24d5bf34c7
|
添加站点功能修改快捷菜单的图标
|
5 years ago |
|
chenxiaojun
|
1ba358fabb
|
管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
|
5 years ago |
|
chenxiaojun
|
c322f6ec7e
|
管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
|
5 years ago |
|
chenxiaojun
|
a91c372a3b
|
修复关联游戏混服选项bug
|
5 years ago |
|
chenxiaojun
|
76bd557efd
|
修复关联游戏混服选项bug
|
5 years ago |
|
ELF
|
bcc34cbd0c
|
打包逻辑重构
|
5 years ago |
|
Your Name
|
22e7866644
|
SDK菜单添加
|
5 years ago |
|
Your Name
|
f1b5a2257d
|
SDK用户菜单-修改
|
5 years ago |
|
Your Name
|
b253d23ae3
|
SDK用户菜单字段名修改
|
5 years ago |
|
Your Name
|
971906dd29
|
SDK用户菜单
|
5 years ago |
|
Your Name
|
118340fa33
|
SDK用户菜单
|
5 years ago |
|
zyx
|
90665c3dc5
|
新增礼包bug修正
|
5 years ago |