1391 Commits (cbb0e82db1290abc7f86197cc17e6109bff631e6)

Author SHA1 Message Date
zhengyongxing cbb0e82db1 提现汇总表时间检索bug修正 5 years ago
zhengyongxing a1df3c547e 编辑汇率时间控件修改 5 years ago
zhengyongxing 5dc5222091 时间控件修改 5 years ago
zhengyongxing c637d7a1d7 离职发放发放完成隐藏 5 years ago
zhengyongxing a6dd2a9830 市场专员业绩导出公式添加 5 years ago
zhengyongxing f4789a1534 市场专员业绩提成bug修正 5 years ago
zhengyongxing e4d1ced122 市场专员业绩提成bug修正 5 years ago
zhengyongxing 0ca629518d 市场专员业绩结算结构修改 5 years ago
zhengyongxing 4bfa0dfa2f 市场专员业绩结算结构修改 5 years ago
zhengyongxing 2303c439aa 市场专员业绩计页面修改 5 years ago
zhengyongxing 962d140d80 Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage 5 years ago
zhengyongxing 9a23b5588b 市场专员业绩计算修正 5 years ago
zhengyongxing 97161900ac 市场专员业绩管理bug修改 5 years ago
zhengyongxing bdeacbd718 市场专员业绩管理 重算调用脚本命令修改 5 years ago
zhengyongxing c96340afa9 市场专员业绩管理bug修改 5 years ago
chenzhi 587d7913ca 优化检索 5 years ago
zhengyongxing 1e80004e3e 市场专员业绩管理bug修改 5 years ago
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
5 years ago
zhengyongxing 83717b64ae 市场专员业绩管理优化 5 years ago
chenzhi 490197a490 移除合作方合同时间限制 5 years ago
zhengyongxing 06bd0bf848 市场专员业绩管理代码提交 5 years ago
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
5 years ago
ELF ecc228409d 修改 5 years ago
zhengyongxing acc45f5911 江息网络漏掉的修改 5 years ago
chenzhi bc75da8c14 解决冲突 5 years ago
chenzhi f62cfca22b 隐藏推广公司分成比例 5 years ago
zhengyongxing 2bc4bf79d9 市场结算管理公司税率提交 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
chenzhi 91ae987c3c 优化游戏比例分成无需大于 5 years ago
chenzhi 9dd4a507e9 隐藏模板批量操作 5 years ago
chenzhi f1824fd7b3 优化新增名称 5 years ago
zhengyongxing 682ce333b1 市场结算管理公司税率提交 5 years ago
chenzhi c76cf038cd 己方公司 5 years ago
zhengyongxing ca5c68d078 推广公司编辑添加合并错误去除 5 years ago
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
5 years ago
zhengyongxing 2fae4219df 公会统计去除 5 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
5 years ago
zhengyongxing 379716298a 市场专员结算代码上传 5 years ago
ELF e3b53e7df1 修改 5 years ago
ELF 34691d6baa 修改 5 years ago
ELF 76fcfec7c2 修改 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
zhengyongxing a2408407b7 上传市场专员结算代码 5 years ago
廖金灵 c1163e7b22 Merge branch 'release' of wmtx/platform into master
版本更新2020.06.24
5 years ago
zhengyongxing c3956f7ed2 平台币金额解释添加 5 years ago
廖金灵 1907985e7b Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
5 years ago
yulingwei ff9b2249b8 新增公司默认选择默认模板 5 years ago
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
5 years ago
chenzhi 95d9f45612 新增检索 5 years ago
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17 5 years ago