chenzhi
|
0237e0ff63
|
优化导出
|
5 years ago |
|
chenzhi
|
1ec951d344
|
优化空值显示
|
5 years ago |
|
chenzhi
|
a3f28b67a5
|
新增游戏搜索
|
5 years ago |
|
chenzhi
|
8ac604be33
|
优化导出
|
5 years ago |
|
chenzhi
|
2619e598e8
|
合并marster
|
5 years ago |
|
chenzhi
|
f731a417bd
|
优化工会关系
|
5 years ago |
|
chenzhi
|
35f2fe3f05
|
优化公司显示
|
5 years ago |
|
chenzhi
|
0c2e2db65d
|
新增税费费率
|
5 years ago |
zhengyongxing
|
53979941a0
|
列表全部开发给市场专员，其他人员的数据隐藏
|
5 years ago |
|
zhengyongxing
|
1acef89380
|
市场业绩提成市场总监管理组添加查看全部用户的权限
|
5 years ago |
|
zhengyongxing
|
2975b9fe35
|
市场业绩提成优化
|
5 years ago |
|
zhengyongxing
|
4bfa0dfa2f
|
市场专员业绩结算结构修改
|
5 years ago |
|
zhengyongxing
|
d40ce89901
|
市场专员业绩结算发放时间选项修改
|
5 years ago |
|
zhengyongxing
|
9a23b5588b
|
市场专员业绩计算修正
|
5 years ago |
|
zhengyongxing
|
97161900ac
|
市场专员业绩管理bug修改
|
5 years ago |
|
chenzhi
|
c9d6b9859d
|
合并热更
|
5 years ago |
|
zhengyongxing
|
80dc2b860c
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage
Conflicts:
Application/Admin/Common/extend.php
Application/Admin/Controller/TimingController.class.php
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
83717b64ae
|
市场专员业绩管理优化
|
5 years ago |
|
chenzhi
|
5fc03a14a4
|
优化cp添加
|
5 years ago |
 ELF
|
3f42d2967c
|
修改
|
5 years ago |
|
zhengyongxing
|
dbad9a08db
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
Conflicts:
Application/Admin/Common/function.php
Application/Admin/Controller/TimingController.class.php
|
5 years ago |
|
ELF
|
990a2bd206
|
解决冲突
|
5 years ago |
|
ELF
|
8224cfb362
|
修改
|
5 years ago |
|
zhengyongxing
|
f63b115641
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
5 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
cd0d9e295f
|
市场专员结算代码上传
|
5 years ago |
|
zhengyongxing
|
379716298a
|
市场专员结算代码上传
|
5 years ago |
|
ELF
|
f0a8b6bc3b
|
修改
|
5 years ago |
|
ELF
|
76fcfec7c2
|
修改
|
5 years ago |
|
ELF
|
5f5a6ee1af
|
修改
|
5 years ago |
|
廖金灵
|
a808b86865
|
Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
|
5 years ago |
|
chenzhi
|
511f53e83c
|
优化权限
|
5 years ago |
|
chenzhi
|
0ba02069a0
|
优化补点计算方式
|
5 years ago |
|
zhengyongxing
|
9aed64f46d
|
推广员充值汇总优化，补单功能添加
|
5 years ago |
|
zhengyongxing
|
4ff957d0f1
|
将官方渠道修改为江息网络
|
5 years ago |
|
chenzhi
|
e1d624fe8b
|
优化导出并聚合数据
|
5 years ago |
|
chenzhi
|
c5e3d78835
|
新增导出
|
5 years ago |
|
chenzhi
|
e80d4eb539
|
新增确认
|
5 years ago |
|
chenzhi
|
93a8bb70e1
|
新增编辑
|
5 years ago |
tping
|
9fd06c27d3
|
Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
6162f9f8a1
|
生成上下游结算单
|
5 years ago |
|
zhengyongxing
|
5f0b7a6de0
|
充值方式文字修正，金猪改成苹果
|
5 years ago |
sunke
|
d7e61edaa1
|
汇付宝
|
5 years ago |
|
chenzhi
|
afee89ec03
|
优化模板无聚合
|
5 years ago |
|
chenzhi
|
6a3b9b6da3
|
新增游戏分成比例
|
5 years ago |
|
chenzhi
|
fd4e0baffd
|
新增游戏比例模板
|
5 years ago |
|
sunke
|
a4377c017e
|
支付设置
|
5 years ago |
|
chenzhi
|
450ef803d6
|
合并
|
5 years ago |
|
chenzhi
|
3e7778df35
|
优化零元问题
|
5 years ago |
|
zhengyongxing
|
4d938b85f4
|
导出账号权限修改配置
|
5 years ago |