Commit Graph

203 Commits (0e878884bb44c2718e816906fcd3b1325a609156)

Author SHA1 Message Date
廖金灵 d73ab9c4cd Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
ELF a4d4a51a2c 完善支付商户操作日志
chenzhi 205c6a83f8 优化上游结算
zhengyongxing a960e0a7e4 商户bug修改
zhengyongxing ee5fc4c7c8 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/View/Spend/lists.html
zhengyongxing 9670bf86b6 商户bug修改
ELF 0803b686c3 解决冲突
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
ELF 557f0203ac 解决冲突
chenzhi 0237e0ff63 优化导出
chenzhi 1ec951d344 优化空值显示
chenzhi a3f28b67a5 新增游戏搜索
zhengyongxing 341fa19b6f 聚合公司功能提交
chenzhi 8ac604be33 优化导出
zhengyongxing 1ff82cce20 聚合下游公司列表添加
chenzhi 2619e598e8 合并marster
zhengyongxing cacb1e4cf4 商户统计结算功能添加
yulingwei 2fbea72d26 up
chenzhi f731a417bd 优化工会关系
chenzhi 35f2fe3f05 优化公司显示
chenzhi 0c2e2db65d 新增税费费率
zhengyongxing 53979941a0 列表全部开发给市场专员,其他人员的数据隐藏
zhengyongxing 1acef89380 市场业绩提成市场总监管理组添加查看全部用户的权限
zhengyongxing 2975b9fe35 市场业绩提成优化
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改
zhengyongxing d40ce89901 市场专员业绩结算发放时间选项修改
zhengyongxing 9a23b5588b 市场专员业绩计算修正
zhengyongxing 97161900ac 市场专员业绩管理bug修改
chenzhi c9d6b9859d 合并热更
zhengyongxing 80dc2b860c Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/market_percentage
 Conflicts:
	Application/Admin/Common/extend.php
	Application/Admin/Controller/TimingController.class.php
	Data/update.sql
zhengyongxing 83717b64ae 市场专员业绩管理优化
chenzhi 5fc03a14a4 优化cp添加
ELF 3f42d2967c 修改
zhengyongxing dbad9a08db Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_statistics
 Conflicts:
	Application/Admin/Common/function.php
	Application/Admin/Controller/TimingController.class.php
ELF 990a2bd206 解决冲突
ELF 8224cfb362 修改
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
zhengyongxing cd0d9e295f 市场专员结算代码上传
zhengyongxing 379716298a 市场专员结算代码上传
ELF f0a8b6bc3b 修改
ELF 76fcfec7c2 修改
ELF 5f5a6ee1af 修改
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
chenzhi 511f53e83c 优化权限
chenzhi 0ba02069a0 优化补点计算方式
zhengyongxing 9aed64f46d 推广员充值汇总优化,补单功能添加
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络
chenzhi e1d624fe8b 优化导出并聚合数据
chenzhi c5e3d78835 新增导出