liuweiwen
|
87de8d2717
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
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 |