4196 Commits (f6af63ca3e86e61c27d0ddbee4cc97430aa405a5)
 

Author SHA1 Message Date
chenzhi 8c25f55c6e 修复不能cp公司选择无效问题 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
5 years ago
chenzhi 44a34bc89f 新增推广公司删除 5 years ago
chenzhi 4e28b39999 新增推广公司编辑功能 5 years ago
chenzhi 6ea7a581f5 推广公司查看 5 years ago
chenzhi f218544e7f 优化推广公司添加 5 years ago
chenzhi da2e3a769c 推广列表查看 5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 5 years ago
liuweiwen 4b480e6f94 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 8462f80777 合作方 5 years ago
zhengchanglong 4ce9af39e5 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing fb14c5888a Merge branch 'hotfix/test_order' into release 5 years ago
zhengyongxing a9924e67c1 测试订单列表与录入bug修改 5 years ago
zhengyongxing 2d0d59c0a5 Merge branch 'hotfix/test_order' of 47.111.118.107:wmtx/platform into hotfix/test_order
 Conflicts:
	Application/Admin/Controller/TestOrderController.class.php
5 years ago
zhengyongxing 12903ef3cd 测试订单列表与录入bug修改 5 years ago
chenzhi 38fc3c3054 推广公司列表2 5 years ago
zhengyongxing c461623b5e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 6f48940e21 生成下游个人结算单回退功能添加 5 years ago
chenzhi a3aa3700a7 修正company_belong模糊问题 5 years ago
chenzhi 542c76f266 推广公司列表1 5 years ago
zhengyongxing cf2cb338f1 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 8dd5f7bf5c 结算单管理添加 5 years ago
chenzhi 92929b1db7 优化推广公司添加 5 years ago
chenzhi 84f5ff2e95 优化添加推广公司结构 5 years ago
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索 5 years ago
chenzhi 1f1e75e736 新增推广公司添加 5 years ago
chenzhi 6a612565c6 扩展推广公司添加 5 years ago
chenxiaojun 13a39d1080 推广平台>数据管理>推广员指标--更新 5 years ago
chenxiaojun ed7a731ae5 推广平台>数据管理>推广员指标--更新 5 years ago
chenxiaojun db6aeb26eb 推广平台>数据管理>推广员指标--更新 5 years ago
chenxiaojun ff489f8a17 Merge remote-tracking branch 'origin/feature/promote_quota' into feature/promote_quota 5 years ago
chenxiaojun 2defa249e8 推广平台>数据管理>推广员指标--更新 5 years ago
ELF 7833847e72 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF 641e401c73 Merge branch 'feature/promote_group' into release 5 years ago
ELF 9ca131aaaa 修改推廣員bug 5 years ago
chenxiaojun 15ed062db3 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun b2909d07d9 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sunke 3dbacf225b 指标下载处理 5 years ago
sunke ffd29e2662 指标导出处理 5 years ago
sunke 712010b241 推广员指标 5 years ago
zhengyongxing f51a576b1d Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 9ab70c84d8 市场结算管理下游结算审核状态添加 5 years ago
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 8a1a15e845 市场结算管理下游结算符号bug修正 5 years ago
zhengyongxing 031d40dc22 生成个人结算单编辑的功能模板 5 years ago
zhengyongxing 955a1917b3 生成个人结算单的功能完成 5 years ago
chenzhi e497fb16ee 移除新增推广公司结构 5 years ago
chenzhi 52971b378f 新增推广公司表结构 5 years ago
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong bdbbeab1a0 添加测试订单录入表 5 years ago