 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 |
|
廖金灵
|
3bfd67dbd3
|
Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计添加聚合充值数据
|
4 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
4 years ago |
|
chenzhi
|
fb9deff8b7
|
优化新增生效的默认时间
|
4 years ago |
|
陈志
|
42d561cc2a
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
0f023bed36
|
优化结算提示
|
4 years ago |
|
ELF
|
fbe8d7a351
|
修改bug
|
4 years ago |
|
chenzhi
|
e2bd47ac2d
|
优化按钮太挤
|
4 years ago |
|
chenzhi
|
fe1853065a
|
优化结算原包名显示
|
4 years ago |
|
陈志
|
0eab18bc14
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
b9604c162a
|
优化操作时间判断
|
4 years ago |
|
chenzhi
|
8de452c8f7
|
优化名称显示
|
4 years ago |
|
陈志
|
01d4824c8a
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
chenzhi
|
f4be3972b2
|
优化结算单确认
|
4 years ago |
|
陈志
|
37d0e5d995
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
b7409ab069
|
优化导出
|
4 years ago |
|
chenzhi
|
eb311348a8
|
优化检索
|
4 years ago |
|
chenzhi
|
47b54d336c
|
优化汇总撤回
|
4 years ago |
|
陈志
|
d572275844
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
4d65542338
|
优化结算包名文字
|
4 years ago |
|
陈志
|
dd5eaf72f7
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
2a303cf0f5
|
优化审核流程
|
4 years ago |
|
chenzhi
|
0aac0cfad7
|
新增结算类型
|
4 years ago |
|
chenzhi
|
31b1c771a1
|
新增全量查看
|
4 years ago |
|
chenzhi
|
a69b21dd14
|
汇总单新增周月结审核
|
4 years ago |
|
chenzhi
|
3ef8061e3e
|
优化个人0值重算
|
4 years ago |
|
chenzhi
|
6b9358c651
|
优化结算
|
4 years ago |
|
chenzhi
|
3cbc769bce
|
优化个人结算
|
4 years ago |
|
chenzhi
|
f70d8cb8a7
|
优化个人结算
|
4 years ago |
|
chenzhi
|
7f01c3ff39
|
优化上游结算方式
|
4 years ago |
|
chenzhi
|
f91b2a5dce
|
优化下游结算
|
4 years ago |
|
chenzhi
|
d946a4c91c
|
优化下游公司结算
|
4 years ago |
|
chenzhi
|
8e77f3ed4d
|
优化上游结算
|
4 years ago |
|
chenzhi
|
16a3bea172
|
优化上游新增服务器费用结算包名
|
4 years ago |
|
chenzhi
|
51c4b07eea
|
优化上游结算包名
|
4 years ago |
|
陈志
|
278a369816
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
|
4 years ago |
|
chenzhi
|
2de8e4a313
|
开启测试验证码
|
4 years ago |
|
chenzhi
|
b0034d5f19
|
优化推广公司游戏申请不审核
|
4 years ago |
|
chenzhi
|
a948986b41
|
优化上游导出
|
4 years ago |