zhengyongxing
|
eebb38dc8c
|
商户列表字段名称修改
|
4 years ago |
|
zhengyongxing
|
9d28947f9b
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
a960e0a7e4
|
商户bug修改
|
4 years ago |
|
zhengyongxing
|
624a2b7cde
|
商户bug修改
|
4 years ago |
|
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 |
|
廖金灵
|
7340d5b4fd
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证
|
4 years ago |
chenzhi
|
2a99226dd7
|
优化订单列表长cp订单显示
|
4 years ago |
|
zhengyongxing
|
45d124b4cd
|
手机号码重复验证
|
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 |
|
ELF
|
49ea782f7c
|
解决冲突
|
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 |
|
廖金灵
|
2ea819c585
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
新增防止并发请求数据
|
4 years ago |
|
廖金灵
|
949570abf4
|
Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
|
4 years ago |
|
ELF
|
ff47282287
|
修改
|
4 years ago |
|
chenzhi
|
5ef1aa6e22
|
新增防止并发请求数据
|
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 |
陈志
|
d5c54234b3
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
e3022cb6c2
|
关闭测试验证码
|
4 years ago |
|
ELF
|
6f8b93a26b
|
修改
|
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 |
|
chenzhi
|
69615c1459
|
优化脚本执行
|
4 years ago |
|
chenzhi
|
0e8730b810
|
优化重算需重新确认
|
4 years ago |
|
ELF
|
56282658fc
|
解决冲突
|
4 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
4 years ago |
|
chenzhi
|
fb9deff8b7
|
优化新增生效的默认时间
|
4 years ago |
|
chenzhi
|
0f023bed36
|
优化结算提示
|
4 years ago |
|
ELF
|
fbe8d7a351
|
修改bug
|
4 years ago |
|
chenzhi
|
e2bd47ac2d
|
优化按钮太挤
|
4 years ago |
|
chenzhi
|
fe1853065a
|
优化结算原包名显示
|
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
|
47b54d336c
|
优化汇总撤回
|
4 years ago |
|
chenzhi
|
4d65542338
|
优化结算包名文字
|
4 years ago |