Commit Graph

3884 Commits (15c841e883beb436d9d471987fd3bece52344bb0)

Author SHA1 Message Date
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' () from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' () from feature/add_item into release
12月功能提交,手机万能验证码屏蔽提交
zhengyongxing 309b195986 12月功能提交
陈志 79ad02ba2e Merge pull request '优化' () from feature/st_mange_20201202 into release
优化
chenzhi 1945cae9a5 优化
张谷成 6e63a3857e Merge pull request 'feature/1211' () from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
tping 6c266178df 数据互通
陈志 9d30d48fac Merge pull request 'feature/st_mange_20201202' () from feature/st_mange_20201202 into release
优化公式
chenzhi f4f430cf61 优化公式
zhengyongxing 23e5632eec 12月功能提交
chenzhi a3e0ecb949 优化结算公式
zhengyongxing f804b7af3f 12份功能提交
廖金灵 bdad3f8db9 Merge branch 'release' into feature/add_item
zhengyongxing fb0acddb3f 12份功能提交
zhengyongxing af5aad352a 备注bug修改
tping 481646222f 后台 手机号规则 实名认证修改
zhengyongxing ec3491943b 12月功能提交
ELF b73b502a67 修改
zhengyongxing 52ff4a2bc6 12月功能提交
zhengyongxing 9bec07c7d4 不结算bug修改
zhengyongxing 747224dae9 12月功能提交
tping e79f18e618 1211 审核列表 甲乙方公司
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
#	Data/update.sql
zhengyongxing 8bb8e4379f 12月功能提交
zhengyongxing b8af3ea384 12月功能提交
chenzhi 4f1bebc3af 优化游戏统计说明
zhengyongxing 7e41ad1e18 12月功能提交
zyx 6b0de87280 未结算接口修改
chenzhi 2bc72f9ae2 优化个人补点不修改公式
chenzhi 8d1f77537a 优化订单列表新增列
chenzhi a741e8d37d 订单新增设备类型
chenzhi 0b979d9b68 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202
chenzhi 24f3489e65 优化导出新增公式
chenzhi 8d156ffb64 新增结算公式
zhengyongxing 166c1d63d6 12月功能提交
tping 31ce7b071c 1211
ELF 78caa452b2 测试资源添加审核人
ELF 88402dfac0 修改
廖金灵 9483e4b7b3 Merge branch 'feature/add_item' of wmtx/platform into master
编辑页面调整,及多个编辑错误修正
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正
ELF cf42967f4f Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
ELF b28e00b9f2 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
chenzhi d06cc0ea10 优化去除同公司奖罚
chenzhi 3053461ee5 优化奖罚排序
廖金灵 401ad97cbc Merge branch 'feature/add_item' of wmtx/platform into master
编辑扣款旧的验证添加
zhengyongxing bb0d37bb53 编辑扣款旧的验证添加
zhengyongxing 10ddadece7 js字符类型修改成数字类型
廖金灵 5b096ad2ff Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
zhengyongxing 923851fea7 11月bug修复