zhengyongxing
|
9a202a393e
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
ee5fc4c7c8
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/View/Spend/lists.html
|
4 years ago |
|
zhengyongxing
|
9670bf86b6
|
商户bug修改
|
4 years ago |
 廖金灵
|
6faa6e0a33
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
优化订单列表长cp订单显示
|
4 years ago |
chenzhi
|
2a99226dd7
|
优化订单列表长cp订单显示
|
4 years ago |
|
廖金灵
|
47c565e31c
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
下游公司字段与上游公司字段一致
|
4 years ago |
|
zhengyongxing
|
57903e8a13
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
ELF
|
edb090feca
|
解决冲突
|
4 years ago |
|
ELF
|
004b540a63
|
解决冲突
|
4 years ago |
|
ELF
|
0803b686c3
|
解决冲突
|
4 years ago |
|
廖金灵
|
9e3de695ca
|
Merge branch 'feature/plateform_statistics' of wmtx/platform into release
市场部统计修改
|
4 years ago |
|
廖金灵
|
e4ab39bf64
|
Merge branch 'feature/ip_search' of wmtx/platform into release
IP查询
|
4 years ago |
|
zhengyongxing
|
ea2683716f
|
下游公司字段与上游公司字段一致
|
4 years ago |
|
廖金灵
|
54ad7191b1
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能
|
4 years ago |
|
廖金灵
|
949570abf4
|
Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
|
4 years ago |
|
ELF
|
e0f71b67c5
|
处理
|
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
|
09629a12a8
|
下游公司字段与上游公司字段一致
|
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 |
陈志
|
e01c7e4e01
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
ELF
|
56282658fc
|
解决冲突
|
4 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
4 years ago |
|
chenzhi
|
fb9deff8b7
|
优化新增生效的默认时间
|
4 years ago |
|
chenzhi
|
0f023bed36
|
优化结算提示
|
4 years ago |
|
chenzhi
|
e2bd47ac2d
|
优化按钮太挤
|
4 years ago |
|
chenzhi
|
b9604c162a
|
优化操作时间判断
|
4 years ago |
|
chenzhi
|
8de452c8f7
|
优化名称显示
|
4 years ago |
chenzhi
|
f4be3972b2
|
优化结算单确认
|
4 years ago |
|
chenzhi
|
b7409ab069
|
优化导出
|
4 years ago |
|
chenzhi
|
eb311348a8
|
优化检索
|
4 years ago |
|
chenzhi
|
4d65542338
|
优化结算包名文字
|
4 years ago |
|
chenzhi
|
2a303cf0f5
|
优化审核流程
|
4 years ago |
|
chenzhi
|
0aac0cfad7
|
新增结算类型
|
4 years ago |
|
chenzhi
|
31b1c771a1
|
新增全量查看
|
4 years ago |
|
chenzhi
|
a69b21dd14
|
汇总单新增周月结审核
|
4 years ago |
|
chenzhi
|
b0034d5f19
|
优化推广公司游戏申请不审核
|
4 years ago |
|
chenzhi
|
a948986b41
|
优化上游导出
|
4 years ago |
|
chenzhi
|
62f2bc350d
|
优化时间控件
|
4 years ago |
|
chenzhi
|
5c857840a2
|
分成比例新增生效检索
|
4 years ago |
|
chenzhi
|
94a3057013
|
新增游戏分成比例导出
|
4 years ago |
|
chenzhi
|
ac65098827
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723
|
4 years ago |
|
廖金灵
|
5f0917220c
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
推广分成特殊申请
|
4 years ago |
|
chenzhi
|
8e4541cb01
|
推广分成特殊申请
|
4 years ago |
|
廖金灵
|
762c93d89e
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
|
4 years ago |
|
chenzhi
|
b1790a8897
|
优化手机不限制
|
4 years ago |
|
廖金灵
|
c67cbc61c2
|
Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
|
4 years ago |
|
chenzhi
|
1e3b1dad66
|
优化排序
|
4 years ago |
|
廖金灵
|
4869d650d9
|
Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
时间格式修正，导出格式修改
|
4 years ago |
|
zhengyongxing
|
815e2e3b88
|
时间格式修正，导出格式修改
|
4 years ago |