zhengyongxing
|
bc627cf224
|
汇总导出bug修改
|
4 years ago |
|
zhengyongxing
|
895b32cee8
|
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
60210fedef
|
撤销汇总名词修改
|
4 years ago |
|
zhengyongxing
|
ee2304d664
|
结算性质名词修改
|
4 years ago |
|
zhengyongxing
|
ca03b8701f
|
聚合页面名称修改
|
4 years ago |
|
zhengyongxing
|
518c902b2a
|
发起汇总修正
|
4 years ago |
|
zhengyongxing
|
deeb4b865b
|
聚合汇总单代码提交
|
4 years ago |
|
zhengyongxing
|
f95b593455
|
Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change
# Conflicts:
# Application/Base/Tool/AggregateClient.class.php
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
400a9b3ded
|
上游导出修正
|
4 years ago |
|
zhengyongxing
|
3c698adba9
|
上游导出修正
|
4 years ago |
|
zhengyongxing
|
ae8cf5ad38
|
上游导出修正
|
4 years ago |
郑永星
|
7f3de4d901
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
下游导出修正
|
4 years ago |
|
zhengyongxing
|
f0c425ae82
|
下游导出修正
|
4 years ago |
|
郑永星
|
f0153776c3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例功能修正
|
4 years ago |
|
郑永星
|
0010a39c76
|
Merge branch 'feature/company_export_change' of wmtx/platform into release
|
4 years ago |
|
zhengyongxing
|
3c6418425a
|
上游导出修正
|
4 years ago |
|
zhengyongxing
|
3b2ddded90
|
特殊比例功能修正
|
4 years ago |
 廖金灵
|
c9b1326c42
|
Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
6596e01a29
|
修改
|
4 years ago |
|
zhengyongxing
|
65532fc0ab
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change_other
Conflicts:
Application/Admin/Controller/PromoteCompanyController.class.php
Application/Base/Tool/AggregateClient.class.php
|
4 years ago |
|
郑永星
|
3bc318daf3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
特殊比例申请功能提交
|
4 years ago |
|
zhengyongxing
|
418d5a6bda
|
特殊比例申请功能提交
|
4 years ago |
|
ELF
|
6e2fda1e26
|
解决冲突
|
4 years ago |
|
廖金灵
|
d48e90e1db
|
Merge branch 'feature/new_game_auth' of wmtx/platform into release
新增游戏自动授权
|
4 years ago |
|
廖金灵
|
3690b7d000
|
Merge branch 'feature/agg_game_fail' of wmtx/platform into release
游戏统计/聚合订单数据相同
|
4 years ago |
|
zhengyongxing
|
23555f8d4d
|
特殊补点功能修改
|
4 years ago |
|
zhengyongxing
|
0215082018
|
特殊补点bug修正
|
4 years ago |
|
zhengyongxing
|
3022525c85
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
4 years ago |
|
zhengyongxing
|
cd331f2c64
|
上下游聚合打款信息修改
|
4 years ago |
chenzhi
|
9234919180
|
优化导出
|
4 years ago |
|
chenzhi
|
6cb4ecb930
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three
|
4 years ago |
|
zhengyongxing
|
2c005d1996
|
特殊补点汇总功能修改
|
4 years ago |
|
zhengyongxing
|
4ed51cb112
|
上下游聚合打款信息修改
|
4 years ago |
|
chenzhi
|
c795e5de6c
|
优化下游个人汇总样式
|
4 years ago |
|
zhengyongxing
|
f4aeae340d
|
特殊补点功能修正
|
4 years ago |
|
zhengyongxing
|
565d3c9576
|
特殊补点功能修改
|
4 years ago |
|
zhengyongxing
|
73dff8839e
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
4 years ago |
陈志
|
8fbf101e88
|
Merge branch 'feature/finance_statement_three' of wmtx/platform into release
优化汇总导出错误
|
4 years ago |
|
chenzhi
|
ce5a83e9bc
|
优化汇总导出错误
|
4 years ago |
|
zhengyongxing
|
50495e73ca
|
特殊补点功能修改
|
4 years ago |
|
zhengyongxing
|
6103908d83
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/Controller/CompanyStatementController.class.php
Application/Admin/Controller/CompanyStatementPoolController.class.php
|
4 years ago |
|
zhengyongxing
|
872de1ff73
|
上下游聚合打款信息修改
|
4 years ago |
|
zhengyongxing
|
b75e0725a1
|
特殊补点功能修改
|
4 years ago |
|
zhengyongxing
|
9265d7c9b6
|
上下游聚合打款信息修改
|
4 years ago |
|
ELF
|
1fbb9f097e
|
ss
|
4 years ago |
|
ELF
|
53f2649d9a
|
ss
|
4 years ago |
|
ELF
|
32bc839dcd
|
合并
|
4 years ago |
|
陈志
|
fbdab69c71
|
Merge branch 'hotfix/add_company_partner' of wmtx/platform into release
优化上游添加错误
|
4 years ago |
|
ELF
|
e0bbec0978
|
修改
|
4 years ago |
|
chenzhi
|
57b692cd67
|
优化上游添加错误
|
4 years ago |