Commit Graph

1414 Commits (0c9177485450834f70debf673650e987bf6a6837)

Author SHA1 Message Date
zhengyongxing 039b496b28 市场专员筛选,月份跳转,及时间筛选修正
zhengyongxing 96f68c4f50 市场专员筛选,月份跳转,及时间筛选修正
廖金灵 98dab102f4 Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单跳转修正,添加筛选发放状态的代码
zhengyongxing ced9d51845 跳转汇总结算单跳转修正,添加筛选发放状态的代码
廖金灵 6af9e39ec9 Merge branch 'feature/market_percentage' of wmtx/platform into release
重算展示权限添加
zhengyongxing dae421270f 重算展示权限添加
廖金灵 262940a42f Merge branch 'feature/market_percentage' of wmtx/platform into release
列表全部开发给市场专员,其他人员的数据隐
zhengyongxing 53979941a0 列表全部开发给市场专员,其他人员的数据隐藏
廖金灵 c008157b0a Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
zhengyongxing 0c5e857ca2 市场业绩提成bug修改
廖金灵 6deed99b79 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成bug修改
zhengyongxing 5ab96edd8f 市场业绩提成bug修改
zhengyongxing 8f4505205b 市场业绩提成优时间大小判断
廖金灵 b58f66f9b8 Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
zhengyongxing b64e5858ea 市场业绩提成优化
廖金灵 886c70665c Merge branch 'feature/market_percentage' of wmtx/platform into release
市场业绩提成优化
zhengyongxing 2975b9fe35 市场业绩提成优化
廖金灵 31de395c6e Merge branch 'feature/market_percentage' of wmtx/platform into release
提现汇总表时间检索bug修正
zhengyongxing cbb0e82db1 提现汇总表时间检索bug修正
廖金灵 aebc8b9f70 Merge branch 'feature/market_percentage' of wmtx/platform into release
编辑汇率时间控件修改
zhengyongxing a1df3c547e 编辑汇率时间控件修改
廖金灵 7576434beb Merge branch 'feature/market_percentage' of wmtx/platform into release
时间控件修改
zhengyongxing 5dc5222091 时间控件修改
郑永星 7608fb3b99 Merge branch 'feature/market_percentage' of wmtx/platform into release
zhengyongxing c637d7a1d7 离职发放发放完成隐藏
廖金灵 6d6ec065b2 Merge branch 'hotfix/retention_down' of wmtx/platform into release
修改导出bug
ELF a17bb698dc 修改bug
zhengyongxing a6dd2a9830 市场专员业绩导出公式添加
zhengyongxing f4789a1534 市场专员业绩提成bug修正
zhengyongxing e4d1ced122 市场专员业绩提成bug修正
zhengyongxing 0ca629518d 市场专员业绩结算结构修改
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改
zhengyongxing 2303c439aa 市场专员业绩计页面修改
zhengyongxing 962d140d80 Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage
zhengyongxing 9a23b5588b 市场专员业绩计算修正
zhengyongxing 97161900ac 市场专员业绩管理bug修改
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改
zhengyongxing c96340afa9 市场专员业绩管理bug修改
chenzhi 587d7913ca 优化检索
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改
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 490197a490 移除合作方合同时间限制
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
ELF ecc228409d 修改
zhengyongxing acc45f5911 江息网络漏掉的修改
chenzhi bc75da8c14 解决冲突
chenzhi f62cfca22b 隐藏推广公司分成比例
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交