Commit Graph

23 Commits (f4f430cf610b035c2fa77a3d6784be5e576a2aa0)

Author SHA1 Message Date
ELF d123f7b779 优化
ELF 3c3222ad26 测试订单优化
zyx 896cdd92b9 平台币增加商户
zhengyongxing a960e0a7e4 商户bug修改
zhengyongxing 9670bf86b6 商户bug修改
zhengyongxing 001e9e70f8 管理后台导出权限添加
chenzhi f3a662324d 修正测试服订单检索错误问题
chenzhi f0a19cfc99 优化设备名称为字典
chenzhi 84fe51efef 支付渠道/测试订单 游戏名字优化
zhengyongxing ffd6238bc1 测试订单bug修正
chenzhi a9f984d0aa 充值大块-操作日志ok
zhengyongxing 96fd5cbdd5 测试服订单管理bug修正
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修改
zhengchanglong 282033afe7 测试订单录入添加分页
zhengchanglong d0de91e89d 测试订单查询修改
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 测试订单录入功能提交
zhengchanglong 254d29f3f2 测试订单录入