liuweiwen
|
969bf4dc8a
|
Merge branch 'feature/yibao_company' into release
# Conflicts:
# Application/Admin/Common/extend.php
|
5 years ago |
|
liuweiwen
|
5d596094a6
|
增加易宝支付
|
5 years ago |
|
liuweiwen
|
3b415976eb
|
增加易宝支付
|
5 years ago |
zhanglingsheng
|
c6e1493035
|
易宝支付
|
5 years ago |
zhengyongxing
|
04f2b0c8df
|
Merge branch 'feature/operation_log' into release
# Conflicts:
# Application/Admin/Common/extend.php
# Data/update.sql
|
5 years ago |
|
zhanglingsheng
|
95f93bdc04
|
配置添加易宝支付
|
5 years ago |
|
zhanglingsheng
|
ee3db4d472
|
获取支付配置添加易宝支付
|
5 years ago |
|
zhengyongxing
|
3c628fa1c6
|
统计日志添加
|
5 years ago |
chenzhi
|
dc171af556
|
分控新增与解除操作日志
|
5 years ago |
|
chenzhi
|
97ff3baaff
|
优化操作日志下载
|
5 years ago |
|
chenzhi
|
7141e3752e
|
优化操作日志基函数
|
5 years ago |
|
zhengyongxing
|
3f4f39e238
|
封装时间函数
|
5 years ago |
|
zhengyongxing
|
756b3b9975
|
操作日志公用函数移到extend.php中
|
5 years ago |
|
liuweiwen
|
02920aab8a
|
资源审核配置列表、新增、编辑、删除、锁定、解锁
|
5 years ago |
|
chenzhi
|
f0d298c042
|
公会统计新增团体类型
|
5 years ago |
|
zhengyongxing
|
be932b1ebd
|
奖罚管理bug修改
|
5 years ago |
yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
|
yulingwei
|
3c44d5d200
|
upt
|
5 years ago |
zhengchanglong
|
99f62f3c14
|
Merge branch 'feature/admin_optimize' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
liuweiwen
|
a1c3ad8fb3
|
数据展示权限
|
5 years ago |
|
zhengyongxing
|
0cbd58862e
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
955a1917b3
|
生成个人结算单的功能完成
|
5 years ago |
|
zhengchanglong
|
cb5cef678d
|
Merge branch 'hotfix/test_order' into release
|
5 years ago |
|
zhengyongxing
|
56ecea6998
|
下游个人结算单生成代码上传
|
5 years ago |
|
zhengchanglong
|
254d29f3f2
|
测试订单录入
|
5 years ago |
|
liuweiwen
|
dfd198e9b7
|
对账系统增加奖罚数据
|
5 years ago |
|
zhengyongxing
|
77463c7e1d
|
市场结算管理上游流水符号修正
|
5 years ago |
|
liuweiwen
|
51d2d91671
|
验证手机号码格式修改
|
5 years ago |
chenzhi
|
39c43c1bee
|
优化游戏分成比例获取函数备注
|
5 years ago |
|
zyx
|
414d36c373
|
cp分成比例方法修正
|
5 years ago |
|
zyx
|
782de31ca8
|
cp分成比例方法添加
|
5 years ago |
|
zyx
|
f58f05d00d
|
cp分成比例方法修正
|
5 years ago |
|
zyx
|
4be5b1ba2c
|
cp分成比例方法添加
|
5 years ago |
chenxiaojun
|
10665cc869
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
|
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 |