 ELF
|
9e68e40200
|
解决冲突
|
4 years ago |
|
ELF
|
531b94bae8
|
版本
|
4 years ago |
zhengyongxing
|
deff984922
|
1.28功能提交
|
4 years ago |
|
zhengyongxing
|
6e767a739c
|
市场业绩功能提交
|
4 years ago |
|
zhengyongxing
|
07ee17ca1d
|
公会信息录入功能添加
|
4 years ago |
|
zhengyongxing
|
3c166a913e
|
Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
# Application/Admin/Controller/CompanyStatementOfflineController.class.php
# Application/Admin/Controller/StatementMangementController.class.php
# Application/Payment/Controller/PaymentController.class.php
# Application/Payment/View/Payment/lists.html
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
6a86a5e76f
|
12.18功打款能提交
|
4 years ago |
|
zhengyongxing
|
8a6191810b
|
12.18功打款能提交
|
4 years ago |
|
zhengyongxing
|
7c4e0e7521
|
12.18功能提交
|
4 years ago |
|
zhengyongxing
|
8430fa1813
|
12.18功能提交
|
4 years ago |
|
廖金灵
|
342b592976
|
Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
|
4 years ago |
|
zhengyongxing
|
27ffddfe75
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
7e41ad1e18
|
12月功能提交
|
4 years ago |
|
ELF
|
78caa452b2
|
测试资源添加审核人
|
4 years ago |
|
zhengyongxing
|
2758c608ad
|
编辑扣款旧的验证添加
|
4 years ago |
|
zhengyongxing
|
baca13a95e
|
换行字数修正
|
4 years ago |
|
zhengyongxing
|
b32f5efd91
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_others
Conflicts:
Data/update.sql
|
4 years ago |
|
elf@home
|
dd66846e68
|
根据推广公司配置推广后台
|
4 years ago |
|
zhengyongxing
|
6811eb806c
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Application/Admin/Controller/CompanyStatementPoolController.class.php
Application/Admin/Controller/CompanyStatementSetController.class.php
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
4526b5b741
|
11月功能提交
|
4 years ago |
|
ELF
|
dd71ccdf83
|
修改
|
4 years ago |
|
zhengyongxing
|
0f44573fe2
|
市场业绩提交
|
4 years ago |
|
zhengyongxing
|
bb5547fb6f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other
Conflicts:
Data/update.sql
|
4 years ago |
|
ELF
|
8c8d01a446
|
修改评级
|
4 years ago |
|
zhengyongxing
|
5c497b94dc
|
分成比例导出修正
|
4 years ago |
|
zhengyongxing
|
2848f0ce90
|
外团推广游戏功能高亮显示
|
4 years ago |
|
zhengyongxing
|
e30cd2fea7
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
a00834e4e5
|
外团推广功能不结算提交
|
4 years ago |
|
zhengyongxing
|
9bf3c89659
|
特殊比例与模板比例添加流水类型
|
4 years ago |
|
ELF
|
06bd640c79
|
修改
|
4 years ago |
|
ELF
|
263e35c097
|
初步提交
|
4 years ago |
|
zyx
|
f028794473
|
Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
d849598540
|
Merge branches 'feature/add_item_release' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item_release
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
ef0c4427ce
|
Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
b4bdcd24fc
|
汇总bug流程修正
|
4 years ago |
|
ELF
|
2ae89b9edb
|
解决冲突
|
4 years ago |
|
ELF
|
afad195062
|
修改
|
4 years ago |
|
ELF
|
19c782b053
|
解决冲突
|
4 years ago |
|
zhengyongxing
|
f757c10c61
|
绑定公司修正
|
4 years ago |
|
zhengyongxing
|
1e67b1d1a1
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
a1ac92dc02
|
押金bug修正
|
4 years ago |
|
ELF
|
268ea4e34d
|
修改
|
4 years ago |
|
zhengyongxing
|
a19f668687
|
财务汇总功能撤回审批修改
|
4 years ago |
|
zhengyongxing
|
fedcbd605b
|
bug修改
|
4 years ago |
|
ELF
|
16122d5d9f
|
修改
|
4 years ago |
|
ELF
|
6e2fda1e26
|
解决冲突
|
4 years ago |
|
ELF
|
32bc839dcd
|
合并
|
4 years ago |
|
zhengyongxing
|
24e33ed8ba
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Data/update.sql
|
4 years ago |
|
elf@home
|
50755b89c5
|
修改
|
4 years ago |
|
ELF
|
2a52df9ebb
|
测试资源权限
|
4 years ago |