Commit Graph

4080 Commits (e7397e38b9afdbe4544b96af7fe2997d544c537b)

Author SHA1 Message Date
sunke e7397e38b9 ios
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
yulingwei c40f5dda26 upt
廖金灵 f72220eeb0 Merge branch 'feature/fee_form' of wmtx/platform into release
ios下载账号隐藏中间部分
zhengyongxing 1987fcd865 ios下载账号隐藏中间部分
sunke 49efb2e60f xiufu
sunke 0ffa97a1dd 修复
廖金灵 05444593b5 Merge branch 'feature/fee_form' of wmtx/platform into release
ios下载账号隐藏中间部分
zhengyongxing b32910a79e ios下载账号隐藏中间部分
sunke 797102a556 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
sunke 5b74e65585 统计
zhengyongxing 6249b6cf81 Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form
 Conflicts:
	Application/Admin/Controller/FinanceController.class.php
zhengyongxing 87b1b04040 充值财务管理金额保留小数点
廖金灵 4a766dfec8 Merge branch 'feature/download_type_list' of wmtx/platform into release
导出问题修复
yulingwei eca43f471d upt
廖金灵 dee22176f5 Merge branch 'feature/ip_forbit' of wmtx/platform into release
测试资源bug修正
zhengyongxing 3b58c877c4 测试资源配置状态添加
廖金灵 4c8cb3c171 Merge branch 'feature/IOSdata' of wmtx/platform into release
修改bug
sunke fea5f4d2d7 ios
廖金灵 bf80a2d99a Merge branch 'feature/download_type_list' of wmtx/platform into release
问题修复
yulingwei 132dee220a fix
sunke 9878ba45e5 取消平台转移
廖金灵 c2b57233a0 Merge branch 'feature/ip_forbit' of wmtx/platform into release
测试资源定时脚本修正
sunke 7194cd49ae 平台币
zhengyongxing 61b5fb48b6 测试资源配置状态添加
廖金灵 21bf9744fb Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单苹果内购限制总开关去除
zhengyongxing 6ac97fa7b1 ip限制白名单页面去除内购总开关
廖金灵 830f1485e9 Merge branch 'fix/member_user_info' of wmtx/platform into release
优化超级签code获取情况
chenzhi a6a177ca0e 优化超级签code获取情况
chenzhi 887e7c891e 超级签售空提醒2
廖金灵 112134ec93 Merge branch 'feature/work_order' of wmtx/platform into release
修改样式问题
廖金灵 5af865cf48 Merge branch 'fix/member_user_info' of wmtx/platform into release
优化超级签售空提醒
chenzhi e6c83927fa 优化超级签售空提醒
廖金灵 e8282fc00c Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip白名单页面问题修正
zhengyongxing bd181dab51 ip限制白名单页面修改
yulingwei 3415ef8336 修改样式问题
廖金灵 df1ca85cf9 Merge branch 'fix/member_user_info' of wmtx/platform into release
修改超级签价格为配置
chenzhi 1bff70297b 修改超级签价格为配置
chenzhi 95ce176bae 修改超级签价格为1分
廖金灵 7be530e5b3 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计问题修复
yulingwei a2ab7b1c66 merge
yulingwei 1ad299ffbe 修复统计问题
sunke fd815ef5a6 html平台币
sunke 88109eb0cd Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
廖金灵 ff5ff3ee80 Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单提示语修改
zhengyongxing 6f749fb99d Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
 Conflicts:
	Application/Admin/Controller/FinancePromoteController.class.php
	Application/Common/Common/extend.php
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit
 Conflicts:
	Data/update.sql
sunke e0d8539ea0 ex
sunke 35f5cc03bb value_detail
sunke e94c64a881 平台币统计