Commit Graph

1863 Commits (e55bfcb2d87454f8f3190dc8fef530bd2c5eee57)

Author SHA1 Message Date
yulingwei 8b51a16730 upt
liuweiwen 32f5137ac6 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 04bb4a7bb7 合作方
sunke 790d56c638 Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into feature/add_promote_company
yulingwei e26f517df1 冲突解决
yulingwei 747bba16b0 汇总结算单管理
zhengyongxing 00a5fed6fd 游戏统计新增设备类型
chenzhi 4eaa92f0fb 优化导出银行卡变科学计数
liuweiwen 52668ace85 合作方导出优化
yulingwei 40ddeae55a upt
yulingwei 47d01e0aff upt
ELF 35b267027c Merge branch 'hotfix/download_name' into release
ELF 129a1103e2 修改beta版下载名称
zhengyongxing 5626dfaf99 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 21cac27332 Merge branch 'feature/admin_optimize' into release
zhengyongxing 70ddcb63e0 生成下游个人结算单bug修改
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release
# Conflicts:
#	Data/update.sql
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release
zhengyongxing 065cf7d566 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 938a82e993 生成下游个人结算单bug修改
liuweiwen e15460b08f 合作方
chenzhi 6bb3387b0e 新增推广公司分成比例百分号
chenzhi f507dde70b 新增推广公司导出功能
yulingwei dfe52865bd upt
zhengyongxing 64122ca8c7 Merge branch 'feature/admin_optimize' into release
zhengyongxing 3b47c94b1e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 2589a76603 生成下游个人结算单bug修改
zhengchanglong ec2c929450 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengchanglong 5f5abce2ec 玩家信息数据显示权限BUG修复
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release
zhengyongxing c8f333fa9a 生成下游个人结算单bug修改
zhengyongxing 46ccf0e3ce Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 71dabfae53 生成下游个人结算单bug修改
chenzhi 31deafcb3c 优化合作公司列表页面
ELF 055e246f70 修改bug
liuweiwen 6d13be7863 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 7da5e25e16 合作方
zhengchanglong c066620128 Merge branch 'feature/admin_optimize' into release
chenzhi a26a1191cc 优化上游结算提示
yulingwei 469a037b0f merge
yulingwei 3c44d5d200 upt
chenzhi 5cea54585f 优化上游结算单选择后初始值变动
chenzhi 8c25f55c6e 修复不能cp公司选择无效问题
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
chenzhi 44a34bc89f 新增推广公司删除
chenzhi 4e28b39999 新增推广公司编辑功能
chenzhi 6ea7a581f5 推广公司查看
chenzhi f218544e7f 优化推广公司添加
chenzhi da2e3a769c 推广列表查看
liuweiwen a1c3ad8fb3 数据展示权限
liuweiwen 4b480e6f94 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 8462f80777 合作方
zhengchanglong 4ce9af39e5 Merge branch 'feature/admin_optimize' into release
zhengyongxing fb14c5888a Merge branch 'hotfix/test_order' into release
zhengyongxing a9924e67c1 测试订单列表与录入bug修改
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
zhengyongxing 12903ef3cd 测试订单列表与录入bug修改
chenzhi 38fc3c3054 推广公司列表2
zhengyongxing c461623b5e Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 6f48940e21 生成下游个人结算单回退功能添加
chenzhi a3aa3700a7 修正company_belong模糊问题
chenzhi 542c76f266 推广公司列表1
zhengyongxing cf2cb338f1 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zhengyongxing 8dd5f7bf5c 结算单管理添加
chenzhi 92929b1db7 优化推广公司添加
chenzhi 84f5ff2e95 优化添加推广公司结构
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索
chenzhi 1f1e75e736 新增推广公司添加
chenzhi 6a612565c6 扩展推广公司添加
chenxiaojun 15ed062db3 管理后台>推广员>结算管理>公会分成管理--更新
chenxiaojun b2909d07d9 管理后台>推广员>结算管理>公会分成管理--更新
sunke 3dbacf225b 指标下载处理
sunke ffd29e2662 指标导出处理
zhengyongxing f51a576b1d Merge branch 'feature/admin_optimize' into release
zhengyongxing 9ab70c84d8 市场结算管理下游结算审核状态添加
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
zhengyongxing 8a1a15e845 市场结算管理下游结算符号bug修正
zhengyongxing 031d40dc22 生成个人结算单编辑的功能模板
zhengyongxing 955a1917b3 生成个人结算单的功能完成
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
zhengchanglong 282033afe7 测试订单录入添加分页
yulingwei e670dfcf7c Merge branch 'release' of 47.111.118.107:wmtx/platform into release
yulingwei e35f20ee70 游戏预警
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release
zhengchanglong d0de91e89d 测试订单查询修改
sunke 8298ef3e3d 删除打印
sunke 739eff3d00 删除打印
zhengchanglong 42a0876ab2 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
zhengchanglong 2b99184273 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
# Conflicts:
#	Application/Admin/View/TestOrder/lists.html
zhengyongxing 2aa68e4412 测试订单录入功能提交
zhengchanglong 53b9573d71 测试订单查询修改
zhengyongxing 8aba8728f0 测试订单录入功能提交
zhengyongxing 56ecea6998 下游个人结算单生成代码上传
zhengchanglong 284f42b315 测试订单录入
zhengchanglong fc0bb831a7 测试订单录入
zhengchanglong 254d29f3f2 测试订单录入
chenxiaojun 89c7855337 管理后台>推广员>结算管理>公会分成管理--更新
chenxiaojun 66d68b0b49 管理后台>推广员>结算管理>公会分成管理--更新
sunke f92533e6a5 渠道计算修复
sunke 8db53afc8b 电子文档及公司录入信息