 ELF
|
edb090feca
|
解决冲突
|
4 years ago |
|
ELF
|
004b540a63
|
解决冲突
|
4 years ago |
|
ELF
|
0803b686c3
|
解决冲突
|
4 years ago |
|
ELF
|
49ea782f7c
|
解决冲突
|
4 years ago |
zhengyongxing
|
4f681f7d72
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
11ff884e6a
|
Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
# Application/Admin/Common/extend.php
# Application/Admin/Controller/AggregateFinanceSetController.class.php
# Application/Admin/Controller/CpJuheCompanyController.class.php
# Application/Admin/View/CpJuheCompany/detail.html
# Application/Admin/View/CpJuheCompany/export.html
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
91178308f9
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
ELF
|
56282658fc
|
解决冲突
|
4 years ago |
chenzhi
|
2a303cf0f5
|
优化审核流程
|
4 years ago |
|
chenzhi
|
4460f8e7cf
|
新增结算包名
|
4 years ago |
|
zhengyongxing
|
1ff82cce20
|
聚合下游公司列表添加
|
4 years ago |
yulingwei
|
1bd33daa54
|
upt
|
4 years ago |
|
chenzhi
|
2619e598e8
|
合并marster
|
4 years ago |
|
ELF
|
096e32d581
|
商户配置
|
4 years ago |
|
yulingwei
|
2fbea72d26
|
up
|
4 years ago |
|
chenzhi
|
d662c89b7e
|
zancun
|
4 years ago |
|
zhengyongxing
|
960903a31c
|
新功能添加
|
4 years ago |
|
chenzhi
|
d9d55a3bcb
|
优化新增下游公司
|
4 years ago |
|
chenzhi
|
69adcbabf8
|
优化推广公司
|
4 years ago |
|
chenzhi
|
5aa7427504
|
新增公司信息编辑
|
4 years ago |
|
chenzhi
|
f7d90780aa
|
新增CP公司审核
|
4 years ago |
|
chenzhi
|
33cf2cf8a6
|
新增审核列表
|
4 years ago |
|
yulingwei
|
33049f5a9f
|
upt
|
4 years ago |
|
chenzhi
|
0c2e2db65d
|
新增税费费率
|
4 years ago |
|
yulingwei
|
e155c92ed6
|
1
|
4 years ago |
|
chenzhi
|
913793ac2c
|
优化打款
|
4 years ago |
|
chenzhi
|
52b1168930
|
优化打款记录
|
4 years ago |
|
chenzhi
|
e9c3355c90
|
优化打款名称
|
4 years ago |
|
chenzhi
|
df878183ee
|
新增打款表
|
4 years ago |
|
chenzhi
|
0c91774854
|
解决冲突
|
4 years ago |
|
chenzhi
|
24f2b76bd6
|
新增导入
|
4 years ago |
|
chenzhi
|
8d32b5104e
|
新增excel打款
|
4 years ago |
|
chenzhi
|
c9d6b9859d
|
合并热更
|
4 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
|
4 years ago |
|
chenzhi
|
5fc03a14a4
|
优化cp添加
|
4 years ago |
|
chenzhi
|
03f4130e9e
|
新增上游合作
|
4 years ago |
|
chenzhi
|
d52ab03714
|
新增推广公司游戏选择
|
4 years ago |
|
zhengyongxing
|
3128c079d3
|
推广员充值换榜定时器优化
|
4 years ago |
|
ELF
|
990a2bd206
|
解决冲突
|
4 years ago |
|
zhengyongxing
|
682ce333b1
|
市场结算管理公司税率提交
|
4 years ago |
|
chenzhi
|
c76cf038cd
|
己方公司
|
4 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
|
4 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
cd0d9e295f
|
市场专员结算代码上传
|
4 years ago |
|
zhengyongxing
|
379716298a
|
市场专员结算代码上传
|
4 years ago |
|
ELF
|
11caa30cfa
|
修改
|
4 years ago |
|
yulingwei
|
8c18f2aa1d
|
1
|
4 years ago |
|
ELF
|
2d872ed710
|
解决冲突
|
4 years ago |
|
yulingwei
|
0decb03cb1
|
merge
|
4 years ago |
|
zhengyongxing
|
25ae6a03a4
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
|
4 years ago |