5925 Commits (6811eb806c619ff6c0372f36dd326e2022cd083d)

Author SHA1 Message Date
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
zhengyongxing 3656c555d1 11月功能提交 4 years ago
chenzhi ffd8c92940 优化奖罚 4 years ago
ELF 89332c0d54 解决冲突 4 years ago
ELF eef296ea08 发放资源自动审核/发放优化 4 years ago
ELF b92f564a49 发放资源自动审核/发放优化 4 years ago
ELF c550846454 修改 4 years ago
zhengyongxing 4526b5b741 11月功能提交 4 years ago
ELF 977cfcba3c 修改 4 years ago
ELF c20d071817 修改 4 years ago
ELF 40123f8c50 修改 4 years ago
ELF 530dded4e7 优化 4 years ago
ELF ceadb8562f 新增60/90日留存率统计 4 years ago
ELF 5253a76963 优化 4 years ago
ELF 3a6b912399 优化 4 years ago
ELF afc95791d2 优化 4 years ago
chenzhi d0a61d3e87 游戏充值导出新增cp列 4 years ago
ELF d0b2e5f459 优化 4 years ago
ELF 1f3eaa06da 修改 4 years ago
ELF 07f7bca3ee 修改 4 years ago
ELF 47ca2f2b9e 修改 4 years ago
ELF e1352fea1e 修改 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
ELF 53f3ad6864 优化 4 years ago
廖金灵 38dc6c0c56 Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
市场专员信息显示通过权限控制
4 years ago
ELF dfdc31f4dc 市场专员信息显示通过权限控制 4 years ago
zhengyongxing 6021f91604 公会订单添加所属商户 4 years ago
zhengyongxing 3f04fa1507 公会统计商户名称修改 4 years ago
zhengyongxing deee3228dd 公会统计商户导出 4 years ago
zhengyongxing 58ff5ad1ed 公会统计--订单详情 新增所属商户展示 4 years ago
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin 4 years ago
zhengyongxing 767ce5734d 市场业绩重算只重算上个月提交 4 years ago
zhengyongxing a3b86e9339 市场业绩提成修正 4 years ago
zhengyongxing d85ac9066d 市场业绩bug修改 4 years ago
zhengyongxing 6c005f01f6 市场业绩比例永久判断bug修改 4 years ago
廖金灵 f7eb64f6ba Merge branch 'feature/add_item_other' of wmtx/platform into master
外团特殊比例自动审核通过
4 years ago
zhengyongxing 48f4fef494 外团特殊比例自动审核通过 4 years ago
zhengyongxing 02635cc6e9 外团特殊比例自动审核通过 4 years ago
zhengyongxing 324deba9c2 外团特殊比例功能提交 4 years ago
zhengyongxing 24f3cbc99e 外团特殊比例功能提交 4 years ago
zhengyongxing cf21a4f324 外团特殊比例自动审核通过 4 years ago
zhengyongxing 6efa26ecfd 外团特殊比例自动审核通过 4 years ago
廖金灵 3099b175c8 Merge branch 'hotfix/orderquery' of wmtx/platform into master
增加清除时间
4 years ago
zhengyongxing d73602d30b Merge branch 'feature/add_item_other' of 47.111.118.107:wmtx/platform into feature/add_item_other 4 years ago
zhengyongxing 0155111706 特殊比例申请比例限制提交 4 years ago
chenzhi 3db0914108 优化导出公司 4 years ago