3896 Commits (64122ca8c7750b11d2bbf55ce9e396b9710cc3c1)
 

Author SHA1 Message Date
zhengyongxing 64122ca8c7 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 3b47c94b1e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 2589a76603 生成下游个人结算单bug修改 5 years ago
zhengchanglong ec2c929450 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengchanglong 5f5abce2ec 玩家信息数据显示权限BUG修复 5 years ago
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing c8f333fa9a 生成下游个人结算单bug修改 5 years ago
zhengyongxing 46ccf0e3ce Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 71dabfae53 生成下游个人结算单bug修改 5 years ago
chenzhi 31deafcb3c 优化合作公司列表页面 5 years ago
ELF 6a86ddc16e Merge branch 'feature/promote_deposit' into release 5 years ago
ELF 055e246f70 修改bug 5 years ago
liuweiwen 6d13be7863 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
liuweiwen 7da5e25e16 合作方 5 years ago
ELF 542ab35cad Merge branch 'release' into feature/promote_deposit 5 years ago
zhengchanglong c066620128 Merge branch 'feature/admin_optimize' into release 5 years ago
chenzhi a26a1191cc 优化上游结算提示 5 years ago
chenzhi 5cea54585f 优化上游结算单选择后初始值变动 5 years ago
chenzhi 8c25f55c6e 修复不能cp公司选择无效问题 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
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
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
zhengyongxing cf2cb338f1 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 8dd5f7bf5c 结算单管理添加 5 years ago
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索 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