1858 Commits (6d91ec7c60ca526cb62bfe21a4db4ed7f6fb930d)

Author SHA1 Message Date
yulingwei 747bba16b0 汇总结算单管理 5 years ago
zhengyongxing 00a5fed6fd 游戏统计新增设备类型 5 years ago
chenzhi 4eaa92f0fb 优化导出银行卡变科学计数 5 years ago
liuweiwen 52668ace85 合作方导出优化 5 years ago
yulingwei 40ddeae55a upt 5 years ago
yulingwei 47d01e0aff upt 5 years ago
ELF 35b267027c Merge branch 'hotfix/download_name' into release 5 years ago
ELF 129a1103e2 修改beta版下载名称 5 years ago
zhengyongxing 5626dfaf99 Merge remote-tracking branch 'origin/release' into release 5 years ago
zhengyongxing 21cac27332 Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 70ddcb63e0 生成下游个人结算单bug修改 5 years ago
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release 5 years ago
zhengyongxing 065cf7d566 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 5 years ago
zhengyongxing 938a82e993 生成下游个人结算单bug修改 5 years ago
liuweiwen e15460b08f 合作方 5 years ago
chenzhi 6bb3387b0e 新增推广公司分成比例百分号 5 years ago
chenzhi f507dde70b 新增推广公司导出功能 5 years ago
yulingwei dfe52865bd upt 5 years ago
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 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
zhengchanglong c066620128 Merge branch 'feature/admin_optimize' into release 5 years ago
chenzhi a26a1191cc 优化上游结算提示 5 years ago
yulingwei 469a037b0f merge 5 years ago
yulingwei 3c44d5d200 upt 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
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 15ed062db3 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun b2909d07d9 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sunke 3dbacf225b 指标下载处理 5 years ago
sunke ffd29e2662 指标导出处理 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
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong 282033afe7 测试订单录入添加分页 5 years ago
yulingwei e670dfcf7c Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
yulingwei e35f20ee70 游戏预警 5 years ago
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release 5 years ago
zhengchanglong d0de91e89d 测试订单查询修改 5 years ago
sunke 8298ef3e3d 删除打印 5 years ago
sunke 739eff3d00 删除打印 5 years ago
zhengchanglong 42a0876ab2 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order 5 years ago
zhengchanglong 2b99184273 Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
# Conflicts:
#	Application/Admin/View/TestOrder/lists.html
5 years ago
zhengyongxing 2aa68e4412 测试订单录入功能提交 5 years ago
zhengchanglong 53b9573d71 测试订单查询修改 5 years ago
zhengyongxing 8aba8728f0 测试订单录入功能提交 5 years ago
zhengyongxing 56ecea6998 下游个人结算单生成代码上传 5 years ago
zhengchanglong 284f42b315 测试订单录入 5 years ago
zhengchanglong fc0bb831a7 测试订单录入 5 years ago
zhengchanglong 254d29f3f2 测试订单录入 5 years ago
chenxiaojun 89c7855337 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun 66d68b0b49 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sunke f92533e6a5 渠道计算修复 5 years ago
sunke 8db53afc8b 电子文档及公司录入信息 5 years ago
sunke 5fe238ccbd 渠道流水计算 5 years ago
liuweiwen 319dde1090 奖罚记录管理根据公司类型搜索 5 years ago
ELF bc2f5dd117 Merge branch 'release' of 47.111.118.107:wmtx/platform into release 5 years ago
ELF bbb31890f6 未收押金会长禁用落地页/下载页 5 years ago
sunke 7f169dc211 渠道流水计算 5 years ago