zyx
|
602e53e82f
|
合并分支dev_zyx财务部分的代码
|
5 years ago |
chenxiaojun
|
8ae754f74a
|
推广后台->财务管理->结算明细--更新
|
5 years ago |
ELF
|
71feea26fb
|
修改bug
|
5 years ago |
ELF
|
89b243930d
|
落地页下载页优化
|
5 years ago |
zhengchanglong
|
561b183bec
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
chenzhi
|
a9bc64a4b2
|
优化统计逻辑
|
5 years ago |
zhengchanglong
|
78e23d19b2
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
zyx
|
8fd435a324
|
月结统计,游戏查看名称修改
|
5 years ago |
chenxiaojun
|
a32565e2e1
|
推广后台->数据管理->数据汇总|每日概况--更新
|
5 years ago |
chenxiaojun
|
7220247ecd
|
推广后台->数据管理->数据汇总|每日概况--更新
|
5 years ago |
zhengchanglong
|
e5c834e054
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
zyx
|
4dfec50ba5
|
月结统计修改
|
5 years ago |
chenxiaojun
|
43603cf493
|
推广后台->数据管理->数据汇总--更新
|
5 years ago |
chenzhi
|
0ae24bf2cd
|
优化财务聚合接口2
|
5 years ago |
chenzhi
|
58c405e914
|
优化财务聚合接口
|
5 years ago |
ELF
|
c3502c6120
|
打包添加ios13兼容
|
5 years ago |
chenzhi
|
0df9045e67
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
chenzhi
|
f54305911c
|
优化api暂存
|
5 years ago |
chenxiaojun
|
3e2d027910
|
推广后台->财务管理->结算明细--更新
|
5 years ago |
chenxiaojun
|
fba89ccb48
|
推广后台->财务管理->结算明细--更新
|
5 years ago |
chenxiaojun
|
1d6ce31515
|
推广后台->财务管理->结算明细--更新
|
5 years ago |
chenxiaojun
|
30aff2bd38
|
推广后台->财务管理->新增->结算明细
|
5 years ago |
ELF
|
dbf113d9d4
|
修改bug
|
5 years ago |
ELF
|
6c6b3b54aa
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
ELF
|
7547e867bb
|
三级变四级修改
|
5 years ago |
ELF
|
fc89281a48
|
3级变4级修改
|
5 years ago |
chenzhi
|
eacdea6f9b
|
暂存修改
|
5 years ago |
chenzhi
|
a9b7b22a4b
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
chenzhi
|
81192f36c8
|
xiufu
|
5 years ago |
sunke
|
372ec046d0
|
安全中心
|
5 years ago |
zyx
|
3d8ed52daf
|
推广后台首页条件修改
|
5 years ago |
chenzhi
|
6c45b4dd3f
|
修改获取下级函数
|
5 years ago |
ELF
|
ae44fc79bd
|
修改
|
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 |
chenzhi
|
18be299b4c
|
同步dev
|
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
|
f0559c3576
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Application/Admin/View/Finance/index.html
|
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 |
zyx
|
a850cfa048
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform 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 |
zyx
|
71b2287647
|
测试资源日志管理修改
|
5 years ago |
chenzhi
|
f9397efebf
|
修改总流水统计方式
|
5 years ago |
chenxiaojun
|
b6a62e2df1
|
推广后台->数据管理->每日概况 -- 更新
|
5 years ago |
zhengchanglong
|
6dcd1549d0
|
Merge branch 'dev_zyx' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
zyx
|
5a7432ef40
|
月结统计新增平台比收入字段,将平台币流水改为平台币支出
|
5 years ago |
chenzhi
|
c8da11a12e
|
新增平台币流水充值
|
5 years ago |
chenxiaojun
|
81ed43afdd
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
zyx
|
b6080180ab
|
测试资源bug修正
|
5 years ago |
chenzhi
|
b4c9f60ac9
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
elf@home
|
fc1cef9ec1
|
修改落地页/下载页
|
5 years ago |
ELF
|
b4168a23f1
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
ELF
|
edc40b8a1b
|
ss
|
5 years ago |
chenzhi
|
8212b4ecaf
|
4级推广申请资源修正
|
5 years ago |
chenzhi
|
498de9ab75
|
同步dev
|
5 years ago |
chenzhi
|
ab2252375d
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
chenzhi
|
c8fb1bb207
|
修改
|
5 years ago |
chenxiaojun
|
681c401686
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
chenxiaojun
|
42d330bbc4
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
chenxiaojun
|
b1b10645fc
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
ELF
|
689cc08b69
|
修改
|
5 years ago |
zhengchanglong
|
5b93736468
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
zyx
|
1201180f79
|
游戏到处删除玩家昵称栏位
|
5 years ago |
sunke
|
8633efd7d6
|
增加部门长分级
|
5 years ago |
jbrazz
|
48de85a3c3
|
upt
|
5 years ago |
zhengchanglong
|
2c80186025
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
zyx
|
fcbf41fa65
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
zyx
|
27e8a0c0b5
|
提示栏文字调整,组长渠道与推广员渠道添加文字提示栏
|
5 years ago |
chenzhi
|
dcc5939692
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
b4b4e7bc00
|
新增强制重新更新
|
5 years ago |
zyx
|
a97ce09429
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
zyx
|
414f471ac1
|
提示栏文字调整
|
5 years ago |
zhengchanglong
|
bf24f74d00
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
chenzhi
|
c547d43330
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
d91a44184f
|
优化数据更新提示
|
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
|
fd97ecf494
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
chenzhi
|
fa29554923
|
肯定没错
|
5 years ago |
zhengchanglong
|
d554815d12
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
chenzhi
|
a1f22ad756
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
2e4067e1de
|
测试
|
5 years ago |
zhengchanglong
|
3da91ecb0f
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
zyx
|
e8fc252599
|
组长统计搜索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 |
chenzhi
|
3983a086ac
|
优化生成数据
|
5 years ago |
chenzhi
|
8796458ead
|
聚合新增月份
|
5 years ago |
chenxiaojun
|
381a2e0a67
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
chenxiaojun
|
bf7c353692
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
ELF
|
00966dc9e4
|
修改
|
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 |
chenzhi
|
af05f08689
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
4f7077a3ec
|
10311331
|
5 years ago |
ELF
|
22dcca566b
|
修改
|
5 years ago |
zyx
|
f16bf0b606
|
月结统计筛选列表逻辑修正
|
5 years ago |
zyx
|
2adc07ec4a
|
组长月结统计页面文字修正
|
5 years ago |
zyx
|
4803bd4a1b
|
组长月结统计页面修正
|
5 years ago |
chenxiaojun
|
a14b18f54f
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
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
|
da1686fe14
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
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 |
sunke
|
9844d5a740
|
订单查询
|
5 years ago |
sunke
|
f15c6e68eb
|
注册明细,订单查询 修改等级结构
|
5 years ago |
chenzhi
|
185f0ca30e
|
优化强制更新
|
5 years ago |
chenzhi
|
2983f5b93f
|
新增强制更新某月份
|
5 years ago |
chenzhi
|
e0857168f8
|
优化接口终结
|
5 years ago |
chenzhi
|
cce64d646b
|
1
|
5 years ago |
zyx
|
82323a7138
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
zyx
|
54a01da982
|
财务管理功能完善
|
5 years ago |
chenzhi
|
483ccdffa2
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
4cf967fbcd
|
优化数据获取
|
5 years ago |
zyx
|
fe8a60093f
|
新增渠道模板提交
|
5 years ago |
zyx
|
d3de669837
|
'代码合并'
|
5 years ago |
jbrazz
|
8859c847f6
|
upt
|
5 years ago |
chenxiaojun
|
750a6dc596
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
chenxiaojun
|
fffbdb739b
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
ELF
|
6d68ddfe07
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
ELF
|
3abbe94774
|
修改bug
|
5 years ago |
jbrazz
|
459b722c1c
|
upt
|
5 years ago |
zhengchanglong
|
5c8573df37
|
修改月份列表
|
5 years ago |
chenxiaojun
|
9c1eeb2448
|
推广后台->游戏管理->专服管理|混服管理 -- 更新
|
5 years ago |
chenzhi
|
06395bcb9d
|
123
|
5 years ago |
chenzhi
|
3b70468942
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
9803b418b9
|
优化统计
|
5 years ago |
ELF
|
5b62b99765
|
三级变四级
|
5 years ago |
chenxiaojun
|
49daffbbe4
|
推广后台->数据管理->每日概况|数据汇总->合计更新
|
5 years ago |
chenxiaojun
|
9169a2084b
|
推广后台->数据管理->每日概况|数据汇总->合计更新
|
5 years ago |
chenxiaojun
|
3be42d0186
|
管理后台->统计->新增->其他注册统计|官方渠道统计
|
5 years ago |
chenxiaojun
|
e247c7dedf
|
管理后台->统计->新增->其他注册统计|官方渠道统计
|
5 years ago |
zyx
|
24cdd7086b
|
'合并代码'
|
5 years ago |
chenzhi
|
b41fbb05b7
|
123
|
5 years ago |
sunke
|
021673f657
|
图片上传补充
|
5 years ago |
chenzhi
|
50efce9315
|
更新spen root
|
5 years ago |
chenzhi
|
f6f47748bc
|
优化时间戳
|
5 years ago |
chenxiaojun
|
28969fd024
|
管理后台->游戏管理->合作方管理->批量删除更新
|
5 years ago |
chenxiaojun
|
19f10c574d
|
管理后台->游戏管理->合作方管理->批量删除更新
|
5 years ago |
chenzhi
|
b3f2069e94
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
d273c5af27
|
spendAPI优化
|
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
|
b39efb2d18
|
同步代码
|
5 years ago |
chenzhi
|
1783cb0b71
|
恢复
|
5 years ago |
chenzhi
|
28e15792e4
|
123
|
5 years ago |
chenzhi
|
d708a6302f
|
123
|
5 years ago |
zyx
|
abeb6acde9
|
git测试
|
5 years ago |
zyx
|
2c4e20911e
|
Merge remote-tracking branch 'origin/dev_zyx' into dev_zyx
# Conflicts:
# Application/Admin/Controller/FinanceController.class.php
|
5 years ago |
zyx
|
882041495e
|
git测试
|
5 years ago |
chenzhi
|
bee4544f70
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
c2c92b4c95
|
xiuag
|
5 years ago |
zyx
|
bedd841eda
|
财务管理功能添加
|
5 years ago |
zyx
|
81c137a1bc
|
财务管理功能添加
|
5 years ago |
chenzhi
|
3d38e78160
|
123
|
5 years ago |
zyx
|
112316c395
|
财务管理功能添加
|
5 years ago |
chenxiaojun
|
20c8165888
|
管理后台->游戏管理->合作方管理->批量删除bug修改
|
5 years ago |
chenxiaojun
|
0963c69f4d
|
管理后台->游戏管理->合作方管理->新增批量删除
|
5 years ago |
chenxiaojun
|
41d45995b0
|
管理后台->游戏管理->合作方管理更新
|
5 years ago |
chenxiaojun
|
dd10535a07
|
管理后台->游戏管理->新增合作方管理
|
5 years ago |
chenzhi
|
a3d0c81d4b
|
修改
|
5 years ago |
chenzhi
|
f5ac904a49
|
优化扶持
|
5 years ago |
zyx
|
d7c9744872
|
扶持号时间格式修改
|
5 years ago |
zyx
|
ae9a01f325
|
管理后台代码回滚
|
5 years ago |
zyx
|
8b4bb3baab
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zyx
|
1ce876c39f
|
管理后台测试资源bug修正
|
5 years ago |
chenxiaojun
|
fbe8a764f1
|
管理后台->删除溪谷入口
|
5 years ago |
chenxiaojun
|
a04f291471
|
管理后台->删除溪谷入口
|
5 years ago |
zyx
|
96effb3525
|
管理后台测试资源bug修正
|
5 years ago |
zyx
|
5c435bad74
|
公用文件添加排序
|
5 years ago |
zyx
|
ecc93af47c
|
测试资源排序添加
|
5 years ago |
ELF
|
6e1a768721
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
e4f1ed99f8
|
修改后台登录页
|
5 years ago |
Your Name
|
6cb3a9ad75
|
SDK菜单
|
5 years ago |
Your Name
|
c1a9c3918e
|
SDK菜单
|
5 years ago |
chenxiaojun
|
032e5de877
|
推广平台->注册明细->bug修复
|
5 years ago |
chenxiaojun
|
8b2e384fb6
|
推广平台->注册明细->bug修复
|
5 years ago |
zyx
|
7e37560efe
|
公告计数负数问题改正
|
5 years ago |
zyx
|
56deca114f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zyx
|
2f2158dbe0
|
详情页公告提示修正
|
5 years ago |
chenxiaojun
|
1ec9c156cf
|
推广平台->数据汇总|每日概况->bug修复
|
5 years ago |
chenxiaojun
|
27665e5b14
|
推广平台->数据汇总|每日概况->bug修复
|
5 years ago |
ELF
|
6df44afb16
|
功能隐藏
|
5 years ago |
zyx
|
b0411e3704
|
详情页公告提示修正
|
5 years ago |
zyx
|
0ffbc8aff9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zyx
|
048e37fdd7
|
详情页公告提示修正
|
5 years ago |
ELF
|
437909d53a
|
测试
|
5 years ago |
chenxiaojun
|
37188cb085
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
chenxiaojun
|
36b9b51817
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
zyx
|
95731bba09
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zyx
|
387f729773
|
首页公告提示修正
|
5 years ago |
ELF
|
674dcc9e55
|
Merge branch 'hotfix/pc' into dev
|
5 years ago |
ELF
|
390974a557
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
4917458099
|
Merge branch 'hotfix/query' into dev
|
5 years ago |
ELF
|
c6a52282d5
|
修改bug
|
5 years ago |
zyx
|
5637b496e9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zyx
|
36de2e17c5
|
扶持号js逻辑修正
|
5 years ago |
zhengchanglong
|
954928b7f2
|
推广员首页优化
|
5 years ago |
zyx
|
31039bdeab
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zyx
|
0d35370ade
|
扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序
|
5 years ago |
zhengchanglong
|
af68a2ef10
|
推官员首页优化
|
5 years ago |
chenxiaojun
|
9ba9710670
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
chenxiaojun
|
af06ea8364
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
chenxiaojun
|
155df3336d
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
chenxiaojun
|
c3c2f91c30
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
chenxiaojun
|
3226b01dfb
|
推广平台->数据汇总|每日概况->列表名词解释调整
|
5 years ago |
chenxiaojun
|
cf5e6c849b
|
推广平台->数据汇总|每日概况->列表名词解释调整
|
5 years ago |
chenxiaojun
|
456c4c925e
|
手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
|
5 years ago |
chenxiaojun
|
63b27d8c1d
|
手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
|
5 years ago |
zyx
|
4a23e1dd8a
|
日志管理bug修复
|
5 years ago |
zyx
|
a16c77181c
|
优化首页计算代码
|
5 years ago |
zyx
|
7ead67f8cb
|
快捷图标代码修正
|
5 years ago |
zyx
|
c461190682
|
首页用户注册充值信息修正,昨日注册用户
|
5 years ago |
zyx
|
219596843b
|
首页用户注册充值信息修正,昨日注册用户
|
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 |
chenxiaojun
|
f46a76649c
|
推广平台->84推广员开权限
|
5 years ago |
chenxiaojun
|
74f88da239
|
推广平台->84推广员开权限
|
5 years ago |
ELF
|
eb09c67dd4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
5ff559cf11
|
修改bug
|
5 years ago |
chenxiaojun
|
9500fbbc80
|
用户手机号注册规则修改
|
5 years ago |
chenxiaojun
|
c4f7a928f9
|
用户手机号注册规则修改
|
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 |
chenxiaojun
|
df3c2d823c
|
推广员后台->2推广员开权限
|
5 years ago |
chenxiaojun
|
cd29b17e03
|
推广员后台->2推广员开权限
|
5 years ago |
chenxiaojun
|
e92790a89f
|
推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
|
5 years ago |
chenxiaojun
|
d56bebdaa6
|
推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
|
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 |