yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
zhengyongxing
|
00a5fed6fd
|
游戏统计新增设备类型
|
5 years ago |
liuweiwen
|
a1c3ad8fb3
|
数据展示权限
|
5 years ago |
|
yulingwei
|
6b6baa4f92
|
合并
|
5 years ago |
chenxiaojun
|
2c52bccaf7
|
管理后台>推广员>结算管理>推广提现>自动审核管理--更新
|
5 years ago |
|
jbRotk
|
c968e54cf8
|
解决冲突
|
5 years ago |
|
chenxiaojun
|
cbe40d4b0f
|
管理后台更新
|
5 years ago |
|
chenxiaojun
|
a8008fbe05
|
管理后台>推广员>结算管理>公会分成管理--规则修改
|
5 years ago |
|
chenxiaojun
|
73f1055303
|
管理后台>推广员>结算管理>推广提现--增加自动审核功能
|
5 years ago |
|
jbRotk
|
65461ff200
|
c
|
5 years ago |
zhengchanglong
|
e6f3329ac8
|
内外团归属BUG修复
|
5 years ago |
|
chenxiaojun
|
66a238dfd4
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
71e02a4add
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
258e10c9d1
|
结算管理--更新
|
5 years ago |
 ELF
|
f7a53c7562
|
Merge branch 'feature/account_safe' into release
|
5 years ago |
|
ELF
|
0f44d9e95c
|
解决冲突
|
5 years ago |
|
zhengchanglong
|
bb08c723a3
|
Merge branch 'feature/group_type' into release-1.0.1
|
5 years ago |
|
chenxiaojun
|
365a276b95
|
公会分成管理--更新
|
5 years ago |
liuweiwen
|
394a3e4bb5
|
cp/工会对账系统
|
5 years ago |
|
chenxiaojun
|
4286817dea
|
推广提现--更新
|
5 years ago |
|
chenxiaojun
|
08dd26f942
|
推广提现--更新
|
5 years ago |
|
chenxiaojun
|
f244b42ab7
|
推广结算--更新
|
5 years ago |
|
ELF
|
500d0fdc2c
|
后台管理系统登录后改变session_id
|
5 years ago |
|
ELF
|
fe68d8e8c9
|
修改oss上传返回结果
|
5 years ago |
|
ELF
|
f472f5e9d3
|
文件保存改成cdn
|
5 years ago |
|
chenxiaojun
|
90eed6f5ca
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
c074b5fb86
|
结算管理--更新
|
5 years ago |
|
ELF
|
0a0cedafd5
|
各个系统登录提示安全优化，sessionon_id变更
|
5 years ago |
|
liuweiwen
|
0b3ae062b1
|
优化：推广员新增与编辑的推广公司增加万盟天下科技
新增需求：推广员增加工会归属和工会关系属性
|
5 years ago |
|
chenxiaojun
|
e884214546
|
会长提现|公会分成管理--更新
|
5 years ago |
|
liuweiwen
|
aaabd0a07f
|
游戏统计搜索时间范围
|
5 years ago |
|
liuweiwen
|
20bee7bbc9
|
管理后台登录时间改为1小时
|
5 years ago |
|
liuweiwen
|
fcbd598e3c
|
管理后台登录时间改为1小时
|
5 years ago |
chenzhi
|
0ef4241570
|
合并statistcs
|
5 years ago |
|
zhengchanglong
|
39b6e98f3b
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
ba59b41fb9
|
数据权限官方渠道添加
|
5 years ago |
|
zhengyongxing
|
d465be8969
|
数据权限提交
|
5 years ago |
|
zhengyongxing
|
ce0e9f943d
|
数据权限bug修正
|
5 years ago |
|
zhengchanglong
|
e08a2eb3ce
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/access_data_foldline.txt
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
cdbf059ee4
|
平台币直充明细列表，搜索，导出
内充支出明细列表，搜索，导出
|
5 years ago |
|
chenxiaojun
|
bd8c4331bd
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
liuweiwen
|
39e3350dd9
|
游戏订单查看
|
5 years ago |
|
chenxiaojun
|
f032257838
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
liuweiwen
|
c0fac39c18
|
游戏统计
|
5 years ago |
|
liuweiwen
|
5d6716b239
|
游戏统计
|
5 years ago |
|
chenxiaojun
|
61bfbd00cc
|
公会分成管理
|
5 years ago |
|
zhengyongxing
|
6dc8366018
|
数据授权修改内容提交
|
5 years ago |
|
liuweiwen
|
42ccd44de3
|
Merge branch 'dev_lww' into dev_permission
# Conflicts:
# Application/Admin/Common/extend.php
# Application/Admin/Controller/MendController.class.php
# Application/Admin/Controller/PromoteController.class.php
# Application/Admin/Model/MemberModel.class.php
|
5 years ago |
|
liuweiwen
|
1212d3249e
|
添加数据权限
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
|
5 years ago |
|
chenzhi
|
db6131a135
|
暂存
|
5 years ago |
|
liuweiwen
|
ecdfd078fc
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
liuweiwen
|
3c6ca71bb6
|
解绑手机
|
5 years ago |
|
liuweiwen
|
fb39008cb5
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
chenzhi
|
25cb177aea
|
新增游戏区服开服预告
|
5 years ago |
|
liuweiwen
|
97a7aa7437
|
落地页
|
5 years ago |
|
liuweiwen
|
6ca5b80d18
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
“用lww
|
2eadac6b53
|
后台-》统计-》流失分析优化
|
5 years ago |
|
“用lww
|
75e2eda083
|
后台-》统计-》流失分析优化
|
5 years ago |
|
“用lww
|
68b75f258c
|
后台-》统计-》流失分析优化
|
5 years ago |
|
yulingwei
|
ee7bb128c0
|
修复
|
5 years ago |
|
zhengchanglong
|
a4dc55f4e3
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
2fb1effdcd
|
后台数据分析应用概况优化
|
5 years ago |
|
yulingwei
|
9ebc7d3655
|
upt
|
5 years ago |
|
yulingwei
|
a7f6d8b7a4
|
upt
|
5 years ago |
|
elf@home
|
1036589f3b
|
修改代码
|
5 years ago |
|
chenxiaojun
|
9075730d83
|
管理后台->游戏订单->游戏充值--更新
|
5 years ago |
|
chenxiaojun
|
3fbdc9daa0
|
管理后台->游戏订单->游戏充值--sql优化
|
5 years ago |
|
ELF
|
905efbfd9a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
c8f072f983
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
jbrazz
|
2a6d9b7571
|
推广员名称
|
5 years ago |
|
chenxiaojun
|
9d3dfd622b
|
推广平台->退出登录--更新
|
5 years ago |
|
chenxiaojun
|
467b193037
|
推广平台->退出登录--更新
|
5 years ago |
|
ELF
|
6bf4e10916
|
Merge branch 'hotfix/oa' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
Your Name
|
a9a95765e2
|
OA获取信息-手机系统变更消息推送
|
5 years ago |
|
jbrazz
|
b21df0a8f4
|
upt
|
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 |
|
ELF
|
831456b333
|
解决冲突
|
5 years ago |
|
jbrazz
|
9300280f78
|
merge feture/ylw
|
5 years ago |
|
jbrazz
|
48b1cdf66f
|
upt
|
5 years ago |
|
jbrazz
|
a8125bf377
|
upt
|
5 years ago |
|
jbrazz
|
48de85a3c3
|
upt
|
5 years ago |
|
zhengchanglong
|
e69bc5f459
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
jbrazz
|
b78c6228b0
|
Merge branch 'hotfix/fix_bug' into dev
|
5 years ago |
|
jbrazz
|
8859c847f6
|
upt
|
5 years ago |
sunke
|
692a1bcc11
|
webuploader插件
|
5 years ago |
|
zyx
|
b39efb2d18
|
同步代码
|
5 years ago |
|
zyx
|
112316c395
|
财务管理功能添加
|
5 years ago |
|
jbrazz
|
5527b0bc31
|
Merge branch 'hotfix/promote_query' into dev
|
5 years ago |
|
jbrazz
|
736c0fd432
|
fix
|
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 |
|
zhengchanglong
|
6154654a35
|
SDK登录BUG修复
|
5 years ago |
|
zhengchanglong
|
dee6c2e60d
|
扶持号SDK登录安全防护业务
|
5 years ago |
|
zyx
|
f64225cff0
|
测试功能移交到总管理后台，扶持号管理bug修正
|
5 years ago |
|
Your Name
|
abbed4b177
|
sdk chinaChar
|
5 years ago |
|
ELF
|
2f3bec1975
|
修改bug
|
5 years ago |
|
ELF
|
2ffa024c4c
|
initial
|
5 years ago |