Commit Graph

2924 Commits (7e41ad1e18c24e12256e01c8b933f635a97a7e56)

Author SHA1 Message Date
zhengyongxing 7e41ad1e18 12月功能提交
zhengyongxing 166c1d63d6 12月功能提交
zhengyongxing 3d1ab70123 11月功能提交
zhengyongxing 5c27c63835 11月功能提交
zhengyongxing 9b87b9c4a1 11月功能提交
zhengyongxing e138517136 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 710439d8df 11月功能提交
chenzhi 986065ab4b 优化名词
zhengyongxing c749df4936 11月功能提交
zhengyongxing 36d40bc24e 11月功能提交
zhengyongxing 5add29fa6b 11月功能提交
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 2040991894 11月功能提交
chenzhi e7501be7c3 优化审核流程
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing a6263b2205 11月功能提交
chenzhi 5bdc0e6f6e 优化汇总方案
chenzhi 55dd67e34d 优化撤回
chenzhi 56681580dd 合并
chenzhi 6d4fce53eb 优化线下打款
chenzhi bd125be3dd 优化汇总审核流程
zhengyongxing 1626640066 11月功能提交
zhengyongxing 4eff2f0aaa 11月功能提交
zhengyongxing d6b1916a5d 11月功能提交
chenzhi bea27fd5de 优化游戏汇总
chenzhi 7f9bb248dd 优化推广员统计
chenzhi 1f694ef47b 优化推广员充值
chenzhi e896f5e649 Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111
chenzhi a6f9d82245 优化推广员累计注册
chenzhi 7a876e01ab 优化新增推广员汇总
zhengyongxing f49cd75e86 11月功能提交
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
廖金灵 da2dc09690 Merge branch 'new_change' of wmtx/platform into master
汇总bug修改
zhengyongxing e098384635 汇总bug修改
zhengyongxing 3656c555d1 11月功能提交
chenzhi ffd8c92940 优化奖罚
ELF 89332c0d54 解决冲突
ELF eef296ea08 发放资源自动审核/发放优化
ELF b92f564a49 发放资源自动审核/发放优化
ELF c550846454 修改
zhengyongxing 4526b5b741 11月功能提交
ELF ceadb8562f 新增60/90日留存率统计
ELF 5253a76963 优化
ELF afc95791d2 优化
chenzhi d0a61d3e87 游戏充值导出新增cp列
ELF 07f7bca3ee 修改
ELF 47ca2f2b9e 修改
ELF e1352fea1e 修改
ELF dd71ccdf83 修改
廖金灵 648cde1eff Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制