elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,459 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

2054 Commits (4caa02a76bc40024d6c5ba7b986314ec399aabe6)

Author SHA1 Message Date
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 电子文档及公司录入信息
sunke 5fe238ccbd 渠道流水计算
liuweiwen 319dde1090 奖罚记录管理根据公司类型搜索
ELF bc2f5dd117 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
ELF bbb31890f6 未收押金会长禁用落地页/下载页
sunke 7f169dc211 渠道流水计算
ELF ed25d54dc8 解决冲突
ELF 501b8099d4 解决冲突
chenzhi 2fe965749e 财务汇总ok
chenxiaojun b7d2931106 管理后台--更新
chenxiaojun e9dae29deb 管理后台>推广员>推广员管理>推广员列表--新增资质认证
chenxiaojun e9581a2e04 管理后台>推广员>结算管理>推广提现--更新
sunke 56981a0acc 渠道计算
yulingwei 0983ea1027 Merge branch 'feature/admin_optimize' into feature/ylw
yulingwei 2cd5574de7 新增审核时间
yulingwei 6b6baa4f92 合并
ELF 69185016a0 修改
liuweiwen dfd198e9b7 对账系统增加奖罚数据
zhengyongxing 5ab9f2cc1c 下游个人结算单生成代码上传
zhengyongxing 77463c7e1d 市场结算管理上游流水符号修正
liuweiwen 2ba96aa424 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen ce960beb6d 合作方手机格式验证修改
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新
chenxiaojun d5a63a7849 管理后台>推广员>结算管理>推广提现>自动审核管理--更新
liuweiwen e6cbcd86d3 Merge branch 'release' into feature/admin_optimize
liuweiwen 2af2505819 合并热修复
liuweiwen 2ed47500f0 Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize
liaojinling e596d11cee 会长押金
zyx 079027a778 Merge branch 'hotfix/dopositCpModify' into release
zyx a9cae8424b 游戏充值bug修改
zyx c2b54611b7 Merge branch 'hotfix/dopositCpModify' into release
zyx 1cfc48ded2 游戏充值cp订单号修改
liuweiwen 2bffe498bf 奖罚记录管理优化
zyx 0aad9c4735 下游结算单生成功能上传
chenzhi aaf67b85cc 新增旧月份统计方法
jbRotk a6b1194be0 解决冲突
jbRotk 5d315d4182 添加工会类型
chenzhi 57e979408e 优化奖罚规则
chenzhi 3703d7040b 财务分类统计脚本1.0
chenzhi 1f5944c0a4 优化奖罚符号问题
zhengchanglong 24d1366d0a Merge branch 'hotfix/recharge_statistics' into release
liuweiwen b94bf93823 0点游戏统计
chenzhi 29618ce878 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 58eb6a0e12 新增cp公司优化奖罚自动获取
liuweiwen 2b51122d13 Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
liuweiwen 9e9a925429 奖罚记录管理
chenxiaojun a7891d6b57 管理后台>推广员>结算管理>推广提现--部分功能优化
jbRotk 72cfd9ec64 新增渠道费率
zhengchanglong 4aeaf8f74c Merge branch 'feature/admin_optimize' into release
liuweiwen 51d2d91671 验证手机号码格式修改
chenzhi 7657db3b18 财务分类-支付渠道/支付类型
jbRotk c84cde9567 Merge branch 'feature/ylw' into feature/admin_optimize
jbRotk 5f510cd4d9 新增奖惩时间
liuweiwen 289fd24ab6 内部公司信息管理
liuweiwen b444a3546b Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize 
# Conflicts:
#	Data/update.sql
liuweiwen c92fa425d2 内部公司信息管理
chenzhi cb4e457ace 财务汇总-按合作方类型
jbRotk c968e54cf8 解决冲突
jbRotk 94afe49b0c upt
chenzhi 993bedc98f 收入类型-测试收入
chenzhi 39c43c1bee 优化游戏分成比例获取函数备注
zyx b0c225591f Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
zyx 414d36c373 cp分成比例方法修正
chenzhi f95b084f88 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 8c756d61d9 cp分成增加符号后上游比例获取修正
zyx 782de31ca8 cp分成比例方法添加
zyx f58f05d00d cp分成比例方法修正
jbRotk 35b6d25ebc upt
chenzhi 5eaadd974a 财务分类汇总-按收入类型1
chenzhi aba7ed22d1 财务汇总分类脚本-按收入类型
zyx 4be5b1ba2c cp分成比例方法添加
chenxiaojun cbe40d4b0f 管理后台更新
chenxiaojun f1b454627e 管理后台更新
sk c612fbc5fd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
chenxiaojun 37ab08b9be 管理后台>推广员>结算管理>公会分成管理--规则修改
chenxiaojun a8008fbe05 管理后台>推广员>结算管理>公会分成管理--规则修改
zhengchanglong 58bd9414d6 Merge branch 'hotfix/recharge_statistics' into release
liuweiwen b5a2ddba3c 游戏订单查看，查询时0点属于当天
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能
zhengchanglong 72d222a64a CP分成比例修改
chenzhi 29868a6331 Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
chenzhi 158c56d543 优化甲方可以自由选择
zyx 07279467ca 管理后台部分限制规则修改 / 开放甲乙方都能为万盟天下后，无法检索出万盟天下
chenzhi 332ff4c3c4 优化生成上游对账单手机及银行卡验证规则
zyx fea720339b 结算单功能优化 / 下游结算单：列表展示游戏不区分安卓IOS，直接展示汇总信息
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新
廖金灵 f66c6505d1 Merge branch 'hotfix/testWhileList' of wmtx/platform into master 
测试外网充值白名单设置BUG修复
sk 636aabb5a0 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
zyx d4850b60be Merge branch 'hotfix/testWhiteList' into release
zyx 2ad5017fae 测试白名单编辑修改成删除
sk f93c9c569d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
xxxx a85c217c6b OA管理员绑定
zyx aac1d6f7b5 Merge branch 'hotfix/testWhiteList' into release
zyx 7beb0938e3 测试白名单修改
sk ce9faf7271 公司录入
jbRotk 65461ff200 c
liuweiwen 0fba64c6f1 数据展示权限：勾选权限时，*号屏蔽的地方要开放，另没数据权限的地方补上
ELF 56a97f7eef 修改bug
ELF e8a0975981 解决冲突
ELF 6993d164a3 解决冲突
ELF d3a3b8cdb7 修改
yulingwei 22addc182c 修改检索问题
sunke 0e0c1798f4 推广导入空数据初始化
yulingwei ac8d7300ad Merge branch 'feature/game_divide_warn' into dev
yulingwei 33a19fbb6a upt
yulingwei f0109e9554 合并请求
yulingwei 45b3c27292 upt
sunke b9ddc1aafb 推广配置
yulingwei eef229d22d Merge branch 'feature/sms_up' of 47.111.118.107:wmtx/platform into feature/sms_up
ELF 2195bb4c55 修改短信发送
zhengchanglong e6f3329ac8 内外团归属BUG修复
zhengchanglong 9961448831 Merge branch 'release' into dev
yulingwei 55ef999729 upt
yulingwei 6daf38aa43 upt
yulingwei dfd274a667 Merge branch 'release' into feature/game_divide_warn
yulingwei 0ebe11027e upt
chenzhi 56617b1e25 Merge branch 'feature/ghcount_change' of 47.111.118.107:wmtx/platform into dev
chenzhi fa784fac8a 优化游戏订单导出
chenzhi 54f2e0abcd 游戏统计新增会长和公司
zhengyongxing ef41dbfcee 下游输出错误修改
zhengyongxing 561e6bd84c 下游输出错误修改
sunke d2b7e91a64 推广配置
liuweiwen 490b6a3369 工会归属隐藏导出
ELF 9c493dd8ef Merge branch 'release' into dev
ELF 0d45be780f 解决冲突
ELF c01b0f1083 发送短信添加ip地址
chenxiaojun 5a75ea406a 更新
liuweiwen ccca9fb0bd 管理后台-》推广员列表可关键内外团搜索
liuweiwen 38c64f5430 管理后台-》推广员列表可关键内外团搜索
yulingwei 076b4393eb upt
yulingwei aafc877e71 merghe
yulingwei d33d0c3f46 upt
liuweiwen 323facd599 管理后台推广员添加时手机号码不可重复
zhengyongxing 46a3028fc9 输出删除
chenxiaojun 29789f5ef6 公会分成管理--更新
zhengyongxing 3fca3c89ad 短信验证码提交
chenxiaojun b367b4a8d3 公会分成管理--更新
zhengyongxing 3741b0d27f 市场结算修正
chenxiaojun 42e07d0f2f 结算管理--更新
chenxiaojun 66a238dfd4 结算管理--更新
zhengyongxing 1ba566a02c 市场结算修正
zhengyongxing a68858d4ed Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 9d5b877220 市场结算生成下游代码修改
chenxiaojun 6e05546db6 公会分成管理--更新
chenxiaojun 71e02a4add 结算管理--更新
chenxiaojun 28897755c9 结算管理--更新
chenxiaojun 258e10c9d1 结算管理--更新
zhengyongxing 4c42ee90e3 市场结算生成下游对账单代码优化
liuweiwen ef975943bb 针对admin的后台账号对游戏充值和角色查询做完全访问权限，没完全访问权限时必须通过搜索才显示结果
zhengyongxing 136f565f9f 市场结算管理设备类型条件修正
yulingwei 23f2334e45 新增充值权限查看
zhengyongxing f86265d38c 市场结算管理设备类型条件修正
sunke 9152a3ef59 推广配置导入功能
zhengchanglong d054e70c73 Merge branch 'release' into dev 
# Conflicts:
#	Application/Admin/Controller/MemberController.class.php
#	Application/Admin/View/Promote/belong_edit.html
zhengyongxing 38cea3f972 用户列表导出锁定备注bug修正
chenxiaojun 63d947f754 推广提现--更新
chenxiaojun 517d4ec05f 公会分成管理--更新
chenxiaojun 48ca90bbf3 公会分成管理--更新
liuweiwen cdfa8e4eee admin权限
liuweiwen 1b2cf94c9b Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 21806993d4 admin权限
chenzhi 5fdb7946cc 新增登陆记录列表统计权限
chenzhi 07e4fb2e56 优化列表和统计权限函数
zhengyongxing 43a335bc28 市场结算管理总流水弹窗优化
liuweiwen c8b184b877 Merge remote-tracking branch 'origin/release' into release
liuweiwen 86fe5f1f9f 工会归属admin不加密推广员账号
chenzhi 4e1567f013 新增玩家列表列表及统计权限
zhengyongxing 16814af0d2 市场结算管理总流水弹窗优化
zhengyongxing 3559d91a32 Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhengyongxing 7770fc13c8 市场结算管理总流水弹窗优化
liuweiwen d1022c85fd Merge remote-tracking branch 'origin/release' into release
liuweiwen 5a633ccb49 工会归属申请时间日期格式化
zhengyongxing 8cbf3574e3 市场结算管理总流水弹窗优化
zhengyongxing f4b6fa4738 用户信息小号隐藏
zhengyongxing 076daf0d4e query冲突解决
liuweiwen 822ec35ff8 Merge branch 'feature/group_type' into release
liuweiwen 2b3099a2d8 工会归属会长不可编辑
ELF a31e42b7c4 Merge branch 'hotfix/link_info' into release
ELF f7a53c7562 Merge branch 'feature/account_safe' into release
ELF c4934613ae 解决冲突
ELF b0bc4c0496 解决冲突
ELF 0f44d9e95c 解决冲突
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1
liuweiwen 08f8c518a6 从dev复制代码
liuweiwen 7431072bbf 从dev复制代码
chenzhi dff83c73d0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 33be79e5cf Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f34b71114f 优化数字提示
zhengyongxing ec027503cc Merge branch 'feature/group_type' into dev
zhengyongxing 13d1da8733 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 63b44a78ff 下游订单生成bug修正
chenzhi fd36d6e674 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi ee5330bfc9 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi e5d8710f0a 优化罚款保存后数据不对
liuweiwen 16d8dd6dcb Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 2d060e6e72 Merge branch 'feature/group_type' into dev
liuweiwen a26b0ab53f Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 6f7dcb9ca5 修改上下游对账单导出文件名
chenxiaojun 6d215bda63 公会分成管理--更新
chenxiaojun 6012fdbdf1 公会分成管理--更新
chenxiaojun 02ccf125dc 公会分成管理--更新
chenxiaojun 365a276b95 公会分成管理--更新
zhengyongxing 1a52a129f2 Merge branch 'feature/group_type' into dev
zhengyongxing 122a27634b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing e73d795ace 生成下游结算单下拉选项框优化
chenzhi 7ff7758df2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi ef0b3c86f0 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi ce92602ca0 优化生成上游订单重复提醒
liuweiwen 9b026796f2 Merge branch 'feature/group_type' into dev
liuweiwen 6caf99e984 对账系统登录界面修改
zhengyongxing c07167e784 结算单bug修正
zhengyongxing 943969bddd Merge branch 'feature/group_type' into dev
zhengyongxing c09c3a591e 结算单bug修正
chenzhi b566a2352a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi cdb0b10c9a 结算列表新增对账单地址
chenzhi fd18ed01fe 合并
chenzhi dbc0e00132 合并
chenzhi d889bef13d 优化上游时间选择提示
chenzhi c3848e5b55 优化上游信息提示
zhengyongxing 8965fe8201 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Application/Admin/Controller/QueryController.class.php
zhengyongxing a2ce005497 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71f2d75b8e 市场结算管理总流水点击查看各个渠道的流水
chenxiaojun ba9b5e33d1 更新
chenxiaojun d615a1402f 公会分成管理--更新
liuweiwen bbc1b05e1c Merge branch 'feature/group_type' into dev
liuweiwen b8e36847a3 cp对账系统退出
liuweiwen f480c20fb7 Merge branch 'feature/group_type' into dev
liuweiwen 57a1d8ed8c 对账系统
zhengyongxing a51291216a Merge branch 'feature/group_type' into dev
zhengyongxing f36202486d 生成上游订单修改
zhengyongxing abfc54a0af Merge branch 'feature/group_type' into dev
zhengyongxing 2f1d5fbd38 生成上游订单修改
chenzhi 0f8da4afac 优化页面显示
chenzhi 9c1cb95290 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 41421a9b10 优化页面显示
liuweiwen 0fa27e9c03 Merge branch 'feature/group_type' into dev
liuweiwen ed706c1b86 公司信息管理加提示
zhengyongxing b735706006 Merge branch 'feature/group_type' into dev
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正
liuweiwen af28ff9155 工会归属查询
liuweiwen c7b9e2a7d6 Merge branch 'feature/group_type' into dev
liuweiwen a7e9f62367 对账系统自动登录
liuweiwen 3f5791ff3f Merge branch 'feature/group_type' into dev
liuweiwen 51844a824e 工会归属会长必填
liuweiwen e2095af7a8 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 49e0e19cc8 推广员与合作公司只能看到自己的公司的对账记录
zhengchanglong a67ffa18d6 Merge branch 'feature/group_type' into dev
zhengchanglong 6e405febc1 设置分成比例安卓IOS同步更新
zhanglingsheng 4043cc04e6 支付设置--添加支付限额
zhengyongxing ae2ad86247 Merge branch 'feature/group_type' into dev
zhengyongxing 8b4c641f02 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 3c9a828537 市场结算官方渠道检索修正
chenzhi 4cd3d5b618 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 5996b5f45e Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cc653c2d2d 优化tp1.id错误
zhengyongxing a4b53c4e9a 结算单管理字段名修正
zhengyongxing 0c403ddf57 结算单管理字段名修正
zhengyongxing 4d6a45657c Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing 73578f1b64 生成下游订单修改
chenzhi 96466100bb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 864e8d693a 优化前端浮点数计算
liuweiwen 64cdea78a3 工会归属管理
zhengyongxing 6baba8db28 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 5d593cf266 Merge branch 'feature/group_type' into dev
zhengyongxing 135cba359e 菜单高亮修改
liuweiwen 7f0dbe1112 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
liuweiwen 1e4b7f69d5 cp/工会对账系统
zhengchanglong 73fb719628 Merge branch 'feature/group_type' into dev
zhengyongxing c27518b988 市场结算添加编辑添加户名
zhengchanglong 868fde2d07 Merge branch 'feature/group_type' into dev
zhengyongxing 26c7190654 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengyongxing ef53562d06 市场结算添加编辑添加户名
chenzhi 8ff8d1dab8 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ac0405329f 优化编辑
liuweiwen 21ee77609c cp/工会对账系统
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Data/update.sql
chenxiaojun 6a8e58325c 更新
chenxiaojun bfc93e0626 公会分成管理--更新
chenxiaojun d995675829 更新
chenxiaojun 1594500eca 资质认证--更新
zhengyongxing 547b0439e3 市场结算添加编辑添加户名
chenzhi 1275c740d5 新增cp对账单删除
zhengyongxing da420ceb5c 市场结算添加编辑添加户名
zhengyongxing b74ac306ae 市场结算添加编辑添加户名
chenzhi 1bb038db4e 优化查看2
chenzhi 89d21c6218 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f06cddc093 优化查看
zhengyongxing 2b335ec910 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 45ea27fd1f 市场结算列表删除操作
chenzhi cba3fc898c 新增查看
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type 
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
liuweiwen 394a3e4bb5 cp/工会对账系统
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善
zhengyongxing ad901c31db 市场结算管理代码编辑完善
zhengyongxing 99f23254ed 市场结算管理代码提交
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71b1498c71 市场结算管理代码提交
chenzhi 25240227e4 新增编辑
chenxiaojun 4a53915c22 更新
chenxiaojun 82784f9da9 推广提现--更新
yulingwei 9fe9a47b6f Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenxiaojun 56956d90de 更新
chenxiaojun 9b47108400 推广提现--更新
chenxiaojun a6b9e5e39f 更新
chenxiaojun 843c54ced5 推广提现--更新
yulingwei b5d71ae215 Merge branch 'feature/pop_rules' into dev
yulingwei 7ea2a465bf 修复问题
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ea6d820408 优化页面显示
chenxiaojun 009842c218 更新
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 9952029e6c Merge branch 'feature/group_type' into dev
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong eb114b33b3 游戏分成比例设定体验优化
zhengyongxing dddd640f9f 结算单管理列表修改