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 |
 廖金灵
|
da2dc09690
|
Merge branch 'new_change' of wmtx/platform into master
汇总bug修改
|
4 years ago |
|
zhengyongxing
|
e098384635
|
汇总bug修改
|
4 years ago |
|
廖金灵
|
7431575d0f
|
Merge branch 'fix/company_20201111' of wmtx/platform into master
|
4 years ago |
陈志
|
6940898e65
|
Merge branch 'fix/company_20201111' of wmtx/platform into release
优化奖罚
|
4 years ago |
chenzhi
|
0114a00a41
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into fix/company_20201111
|
4 years ago |
|
zhengyongxing
|
3656c555d1
|
11月功能提交
|
4 years ago |
|
chenzhi
|
ffd8c92940
|
优化奖罚
|
4 years ago |
|
廖金灵
|
181b22969d
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能优化
|
4 years ago |
|
ELF
|
89332c0d54
|
解决冲突
|
4 years ago |
|
廖金灵
|
170082131a
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
发放资源自动审核/发放优化
|
4 years ago |
|
ELF
|
eef296ea08
|
发放资源自动审核/发放优化
|
4 years ago |
|
廖金灵
|
d991c94c7c
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
发放资源自动审核/发放优化
|
4 years ago |
|
ELF
|
b92f564a49
|
发放资源自动审核/发放优化
|
4 years ago |
|
廖金灵
|
3b071f30d9
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
修改
|
4 years ago |
|
ELF
|
c550846454
|
修改
|
4 years ago |
|
zhengyongxing
|
4526b5b741
|
11月功能提交
|
4 years ago |
|
廖金灵
|
c0cafc43de
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源bug
|
4 years ago |
|
ELF
|
977cfcba3c
|
修改
|
4 years ago |
|
廖金灵
|
6e6e6a44d7
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源bug
|
4 years ago |
|
ELF
|
c20d071817
|
修改
|
4 years ago |
|
廖金灵
|
3330ab1e30
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源发放bug
|
4 years ago |
|
ELF
|
40123f8c50
|
修改
|
4 years ago |
|
廖金灵
|
7de7482f2a
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
优化
|
4 years ago |
|
ELF
|
530dded4e7
|
优化
|
4 years ago |
|
廖金灵
|
c3a97d1766
|
Merge branch 'hotfix/user_retention_6090' of wmtx/platform into master
新增60/90日留存率统计
|
4 years ago |
|
ELF
|
ceadb8562f
|
新增60/90日留存率统计
|
4 years ago |
|
廖金灵
|
6fbcf4f426
|
Merge branch 'fix/company_20201111' of wmtx/platform into master
游戏充值导出新增cp列
|
4 years ago |
|
陈志
|
722d914a9e
|
Merge branch 'fix/company_20201111' of wmtx/platform into release
|
4 years ago |
|
廖金灵
|
fe89ff3825
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源功能优化
|
4 years ago |
|
ELF
|
5253a76963
|
优化
|
4 years ago |
|
廖金灵
|
bdb6f4921f
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源优化
|
4 years ago |
|
ELF
|
3a6b912399
|
优化
|
4 years ago |
|
廖金灵
|
f1a3be41cc
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源优化
|
4 years ago |
|
ELF
|
afc95791d2
|
优化
|
4 years ago |
|
chenzhi
|
d0a61d3e87
|
游戏充值导出新增cp列
|
4 years ago |
|
廖金灵
|
2d5503f237
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源功能优化
|
4 years ago |
|
ELF
|
d0b2e5f459
|
优化
|
4 years ago |
|
廖金灵
|
52e620895b
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源功能修改
|
4 years ago |
|
ELF
|
1f3eaa06da
|
修改
|
4 years ago |
|
廖金灵
|
b7227d95ca
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源功能修改
|
4 years ago |
|
ELF
|
07f7bca3ee
|
修改
|
4 years ago |
|
廖金灵
|
cfd80568d3
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into release
测试资源功能修改
|
4 years ago |
|
ELF
|
47ca2f2b9e
|
修改
|
4 years ago |
|
ELF
|
e1352fea1e
|
修改
|
4 years ago |
|
廖金灵
|
1784e361fa
|
Merge branch 'release' of wmtx/platform into master
市场专员/推广员信息显示通过权限控制
|
4 years ago |
|
陈志
|
8d83e68029
|
Merge branch 'fix/company_20201111' of wmtx/platform into release
优化页面页数
|
4 years ago |
|
chenzhi
|
cdd1cd7d7f
|
优化页面页数
|
4 years ago |
|
ELF
|
dd71ccdf83
|
修改
|
4 years ago |
|
廖金灵
|
648cde1eff
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制
|
4 years ago |