chenxiaojun
|
258e10c9d1
|
结算管理--更新
|
5 years ago |
liuweiwen
|
6f7dcb9ca5
|
修改上下游对账单导出文件名
|
5 years ago |
zhengyongxing
|
c09c3a591e
|
结算单bug修正
|
5 years ago |
|
zhengyongxing
|
7f99dafb2c
|
市场结算管理 上游结算流水bug修正
|
5 years ago |
|
liuweiwen
|
1e4b7f69d5
|
cp/工会对账系统
|
5 years ago |
|
liuweiwen
|
21ee77609c
|
cp/工会对账系统
|
5 years ago |
|
liuweiwen
|
394a3e4bb5
|
cp/工会对账系统
|
5 years ago |
|
zhengyongxing
|
ea140a430f
|
导出模板方法上传
|
5 years ago |
|
zhengyongxing
|
ba158e6b9a
|
市场结算管理上传
|
5 years ago |
|
liuweiwen
|
50320be1d2
|
新增需求：管理后台-》推广公会归属管理，列表，新增，编辑，审批
|
5 years ago |
|
zhengyongxing
|
89883d2005
|
新增市场结算管理
|
5 years ago |
|
zhengyongxing
|
13f5128dd8
|
支付渠道统计导出bug修正,游戏充值充值方式检索修正
|
5 years ago |
chenzhi
|
82afa60d12
|
优化玩家列表导出2
|
5 years ago |
|
chenzhi
|
d3ccc3bb5b
|
暂存
|
5 years ago |
|
chenzhi
|
9b7f3d1104
|
优化csv导出默认为不转码
|
5 years ago |
|
chenzhi
|
9d89be4527
|
优化公司游戏名游戏类型关系检索
|
5 years ago |
|
chenzhi
|
cf89e73281
|
优化csv导出函数
|
5 years ago |
zhengchanglong
|
ab5f7267e5
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
chenzhi
|
629c733742
|
删除函数重复问题
|
5 years ago |
|
chenzhi
|
0ef4241570
|
合并statistcs
|
5 years ago |
|
liuweiwen
|
2e818c04f8
|
登录记录搜索
|
5 years ago |
|
zhengchanglong
|
484972e9f2
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
zhengyongxing
|
b8859837fb
|
登录数据权限数据
|
5 years ago |
|
liuweiwen
|
2096c22826
|
注释
|
5 years ago |
|
liuweiwen
|
86dd4a2952
|
【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录
改为展示这个会长及其所属推广员的登录记录
|
5 years ago |
|
zhengchanglong
|
4968ace29d
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Common/function.php
# Application/Home/Controller/DownloadController.class.php
|
5 years ago |
|
zhengchanglong
|
dbaf93b630
|
非管理员数据加密显示
|
5 years ago |
|
chenzhi
|
c5dc3b4f22
|
优化会长统计导出1
|
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 |
|
chenzhi
|
b743cd73e1
|
新增导出csv函数
|
5 years ago |
|
zhengyongxing
|
d465be8969
|
数据权限提交
|
5 years ago |
|
liuweiwen
|
fe5ae6a499
|
搜索的推广员数据权限
|
5 years ago |
|
chenxiaojun
|
5034cb863b
|
管理后台>推广员管理>公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
ce0e9f943d
|
数据权限bug修正
|
5 years ago |
|
chenxiaojun
|
aa5e404188
|
管理后台>推广员管理>公会分成管理--更新
|
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 |
|
zhengchanglong
|
7c7ec4fc1d
|
Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
# Application/Admin/Common/function.php
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
|
5 years ago |
|
liuweiwen
|
62f5098df7
|
处理数据权限筛选时，不覆盖原有的搜索字段promote_id
|
5 years ago |
|
chenxiaojun
|
cf8f6d007f
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
|
5 years ago |
zhanglingsheng
|
3b444155d8
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
09ba38fc79
|
超级签统计
|
5 years ago |
|
chenxiaojun
|
f2fc739db2
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
chenxiaojun
|
bd8c4331bd
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
chenzhi
|
ff04347526
|
公会统计1
|
5 years ago |
|
zhanglingsheng
|
6ddf42181c
|
游戏查询联动
|
5 years ago |
|
zhengyongxing
|
6dc8366018
|
数据授权修改内容提交
|
5 years ago |
|
zhengchanglong
|
732ba257ec
|
修改身份证加密显示方式
|
5 years ago |
|
zhengchanglong
|
8a241cceb8
|
修改身份证加密显示方式
|
5 years ago |
|
liuweiwen
|
de7d34576d
|
添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
|
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 |