6938 Commits (36d40bc24e4c8036fb82e9c434ebfd5ab05710d4)
 

Author SHA1 Message Date
zhengyongxing 36d40bc24e 11月功能提交 4 years ago
zhengyongxing 5add29fa6b 11月功能提交 4 years ago
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing 2040991894 11月功能提交 4 years ago
chenzhi e7501be7c3 优化审核流程 4 years ago
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing a6263b2205 11月功能提交 4 years ago
chenzhi 5bdc0e6f6e 优化汇总方案 4 years ago
chenzhi 55dd67e34d 优化撤回 4 years ago
chenzhi 56681580dd 合并 4 years ago
chenzhi 6d4fce53eb 优化线下打款 4 years ago
chenzhi bd125be3dd 优化汇总审核流程 4 years ago
zhengyongxing 1626640066 11月功能提交 4 years ago
万盟天下 d7eb2b75a2 Merge branch 'release' of wmtx/platform into master
优化游戏汇总
4 years ago
zhengyongxing 4eff2f0aaa 11月功能提交 4 years ago
zhengyongxing d6b1916a5d 11月功能提交 4 years ago
陈志 08068c6349 Merge branch 'fix/company_20201111' of wmtx/platform into release
优化游戏汇总
4 years ago
chenzhi ad1d4e65a5 优化游戏汇总 4 years ago
chenzhi bea27fd5de 优化游戏汇总 4 years ago
chenzhi 7f9bb248dd 优化推广员统计 4 years ago
chenzhi 1f694ef47b 优化推广员充值 4 years ago
chenzhi e896f5e649 Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111 4 years ago
chenzhi a6f9d82245 优化推广员累计注册 4 years ago
chenzhi 7a876e01ab 优化新增推广员汇总 4 years ago
zhengyongxing f49cd75e86 11月功能提交 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
廖金灵 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