zhengyongxing
|
b768d41935
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Application/Home/Controller/PackageController.class.php
|
5 years ago |
zhengyongxing
|
b6b97c130d
|
测试资源代码修正
|
5 years ago |
zhengyongxing
|
b698495dbb
|
游戏统计添加元素修正
|
5 years ago |
ELF
|
d9cc82f73a
|
修改网站注册
|
5 years ago |
ELF
|
908722c5be
|
修改
|
5 years ago |
zhengyongxing
|
fcc7bf2aaa
|
管理后台-财务管理-游戏统计-添加元素
|
5 years ago |
zhengyongxing
|
001e9e70f8
|
管理后台导出权限添加
|
5 years ago |
ELF
|
41e1801550
|
修改手机登录bug
|
5 years ago |
廖金灵
|
bab7fec46d
|
Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
|
5 years ago |
廖金灵
|
9222d99127
|
Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
|
5 years ago |
chenzhi
|
2401acb9a0
|
优化公会统计bug
|
5 years ago |
chenzhi
|
2b7f434955
|
财务管理-游戏管理 游戏名称列表和导出优化
|
5 years ago |
chenzhi
|
55d49e8b4b
|
优化推广公会列表导出
|
5 years ago |
ELF
|
4a1ffd2955
|
解决冲突
|
5 years ago |
chenzhi
|
1761d37b5c
|
推广公会列表 适配新内外团规则
|
5 years ago |
chenzhi
|
d7662eb305
|
推广员现在归属于公司团体
|
5 years ago |
zhengyongxing
|
6f749fb99d
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
Conflicts:
Application/Admin/Controller/FinancePromoteController.class.php
Application/Common/Common/extend.php
|
5 years ago |
廖金灵
|
a1f3c6e205
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
|
5 years ago |
yulingwei
|
ead4a8598e
|
upt
|
5 years ago |
zhengyongxing
|
a086b38d3e
|
管理后台日志唯一键值bug修改
|
5 years ago |
zhengyongxing
|
958fb41227
|
管理后台日志唯一键值修改
|
5 years ago |
chenzhi
|
381327ae21
|
优化游戏统计
|
5 years ago |
ELF
|
dae2dd5fd9
|
优化游戏
|
5 years ago |
zhengyongxing
|
b87dec3aee
|
管理员权限从用户改成以组的形式
|
5 years ago |
zhengyongxing
|
665b4c8bfa
|
推广结算管理日志添加
|
5 years ago |
chenxiaojun
|
118aae4f83
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
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 |