liuweiwen
|
0b3ae062b1
|
优化:推广员新增与编辑的推广公司增加万盟天下科技
新增需求:推广员增加工会归属和工会关系属性
|
5 years ago |
廖金灵
|
b12b133a06
|
Merge branch 'hotfix/shift-player' of wmtx/platform into release
修改玩家迁移限制
|
5 years ago |
elf@home
|
e59a2f7350
|
添加玩家迁移只对同一推广员限制
|
5 years ago |
ELF
|
f1dc5f8920
|
推广员继承company_id
|
5 years ago |
ELF
|
87fb1f526e
|
修改推广员添加时初始默认状态
|
5 years ago |
elf@home
|
6e354fe3b3
|
优化链接归属查询
|
5 years ago |
ELF
|
da5e8b9050
|
修改
|
5 years ago |
liuweiwen
|
2096c22826
|
注释
|
5 years ago |
ELF
|
b36e1f1bc9
|
解决冲突
|
5 years ago |
ELF
|
c90851996c
|
修改bug
|
5 years ago |
liuweiwen
|
e30f2f9601
|
Merge branch 'dev' into dev_lww
# Conflicts:
# Application/Admin/Controller/FileController.class.php
# Application/Admin/Controller/GameController.class.php
# Application/Admin/View/Game/edit.html
# Application/Home/Controller/HomeController.class.php
# Application/Home/View/default/Home/landingPage.html
# Public/Home/css/index2.css
|
5 years ago |
ELF
|
bb2996dbee
|
迁移忽略结算
|
5 years ago |
ELF
|
289b40329f
|
添加换绑时金额
|
5 years ago |
liuweiwen
|
1693f7fa98
|
推广公司
|
5 years ago |
liuweiwen
|
d51725f1af
|
新增推广员时,新增推广所属公司
|
5 years ago |
ELF
|
3e7382542d
|
打包区分ios新旧包
|
5 years ago |
liaojinling
|
c637a8bfe0
|
打包
|
5 years ago |
ELF
|
81a968947b
|
修改bug
|
5 years ago |
liaojinling
|
d5dc2396f2
|
修改
|
5 years ago |
liaojinling
|
ca4f1954e4
|
修改bug
|
5 years ago |
liaojinling
|
1204b1a0e8
|
修改
|
5 years ago |
liaojinling
|
fe6dd1ddff
|
改成旧的打包方式
|
5 years ago |
ELF
|
ef60ca85cf
|
修改
|
5 years ago |
ELF
|
a91a5d5759
|
修改
|
5 years ago |
ELF
|
128c11f5b8
|
修改
|
5 years ago |
ELF
|
25fa79ea55
|
修改玩家迁移
|
5 years ago |
ELF
|
4fc5b08289
|
修改
|
5 years ago |
ELF
|
1f167778a7
|
调试
|
5 years ago |
ELF
|
88385b2f87
|
调试
|
5 years ago |
ELF
|
1e976d620b
|
调试
|
5 years ago |
ELF
|
b08c7748c9
|
调试
|
5 years ago |
ELF
|
494098abc1
|
修改分包
|
5 years ago |
elf@home
|
8d6c547468
|
支持分片文件上传
|
5 years ago |
chenxiaojun
|
efb4a771b0
|
推广平台->数据管理->每日概况|数据汇总--更新
|
5 years ago |
chenxiaojun
|
98fe853743
|
推广平台->数据管理--更新
|
5 years ago |
chenxiaojun
|
80f76c4490
|
推广平台->数据管理--更新
|
5 years ago |
ELF
|
112d7462bc
|
修改bug
|
5 years ago |
ELF
|
5a98b86a07
|
修改bug
|
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
|
401edecd61
|
target_level
|
5 years ago |
ELF
|
c0f19228d2
|
修改bug
|
5 years ago |
ELF
|
639e7117b8
|
修改bug
|
5 years ago |
ELF
|
de00fe5e48
|
修改bug
|
5 years ago |
ELF
|
3ebaf13810
|
修改bug
|
5 years ago |
ELF
|
270e24346d
|
修改bug
|
5 years ago |
ELF
|
1fd7023c5f
|
代码优化
|
5 years ago |
ELF
|
9e1c25a2a3
|
修改bug
|
5 years ago |
ELF
|
b4afa5d8b2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
065245d657
|
优化查询
|
5 years ago |
chenxiaojun
|
15373077b7
|
推广平台->数据管理->每日概况|数据汇总--登录统计优化
|
5 years ago |
chenxiaojun
|
1c79152b5c
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
chenxiaojun
|
1cfa474b83
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
ELF
|
a1c1cb44ae
|
修改bug
|
5 years ago |
ELF
|
01dfe50442
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
3092dcb237
|
修改
|
5 years ago |
chenxiaojun
|
232760c351
|
推广平台->数据管理->每日概况|数据汇总--sql优化
|
5 years ago |
elf@home
|
1036589f3b
|
修改代码
|
5 years ago |
ELF
|
3af8fe116d
|
修改bu
|
5 years ago |
sunke
|
8951a502c2
|
修改bug
|
5 years ago |
sunke
|
94bede9a41
|
平台币修改
|
5 years ago |
sunke
|
c3caed08b3
|
bug
|
5 years ago |
ELF
|
3b681670df
|
上传
|
5 years ago |
ELF
|
6cdee448c0
|
修改bug
|
5 years ago |
ELF
|
1bffd62357
|
修改bug
|
5 years ago |
ELF
|
2c608a73c9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
ELF
|
1a0175e583
|
修改结构
|
5 years ago |
zhengchanglong
|
16d54e6add
|
Merge branch 'feature/promote' into dev
|
5 years ago |
ELF
|
9e83202467
|
修改bug
|
5 years ago |
chenxiaojun
|
e2fa14c1c8
|
推广平台->数据管理->数据汇总->合计--更新
|
5 years ago |
ELF
|
175e38f712
|
修改bug
|
5 years ago |
ELF
|
16d458155a
|
修改打包日志
|
5 years ago |
ELF
|
ed82ea4103
|
添加打包日志记录
|
5 years ago |
ELF
|
f2765313fd
|
优化打包
|
5 years ago |
ELF
|
6c636a92f5
|
修改
|
5 years ago |
ELF
|
e56256ba1d
|
修改bug
|
5 years ago |
ELF
|
c4d35c26d4
|
修改bug
|
5 years ago |
ELF
|
85e466c3fd
|
修改bug
|
5 years ago |
ELF
|
e27c5a5266
|
修改bug
|
5 years ago |
ELF
|
b2df7e0fe3
|
修改bug
|
5 years ago |
ELF
|
fbce375679
|
修改bug
|
5 years ago |
ELF
|
3d46a55811
|
修改bug
|
5 years ago |
ELF
|
c88892ec59
|
修改
|
5 years ago |
ELF
|
784de48bf9
|
修改bug
|
5 years ago |
ELF
|
c2c8f11d01
|
修改
|
5 years ago |
ELF
|
47e2706e26
|
修改bug
|
5 years ago |
ELF
|
070cc2e7c2
|
修改bug
|
5 years ago |
ELF
|
679acf6cf1
|
修改分包
|
5 years ago |
ELF
|
09672d13b4
|
修改分包bug
|
5 years ago |
ELF
|
c6627a53c2
|
将plist demo写入php文件
|
5 years ago |
ELF
|
327bf6cd87
|
修改配置
|
5 years ago |
ELF
|
edc6a7be73
|
修改冲突
|
5 years ago |
ELF
|
9abb4ebb2c
|
修改
|
5 years ago |
chenzhi
|
7e37f3a2df
|
优化迁移用户addshifttask
|
5 years ago |
ELF
|
a8bc52df33
|
修改
|
5 years ago |
ELF
|
6f1e4551ac
|
修改bug
|
5 years ago |
ELF
|
e0d542b5f6
|
解决冲突
|
5 years ago |
ELF
|
eb15fc7dfc
|
Merge branch 'feature/pack' into feature/promote
|
5 years ago |
ELF
|
f056143dee
|
修改bug
|
5 years ago |
ELF
|
08774a0954
|
完善添加推广员
|
5 years ago |