Commit Graph

4648 Commits (61d04183402b76845e8cba9dd96b945209a34861)
 

Author SHA1 Message Date
chenzhi 61d0418340 推广公司管理 修改内外团影响底下
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi d7662eb305 推广员现在归属于公司团体
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择
chenzhi d7737291ed 暂存1
廖金灵 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下载账号隐藏中间部分
廖金灵 45cd6b74af Merge branch 'feature/PlatFormCoinData' of wmtx/platform into release
平台币统计
sunke 49efb2e60f xiufu
廖金灵 4469b9cadd Merge branch 'feature/PlatFormCoinData' of wmtx/platform into release
平台币统计bug修复
sunke 0ffa97a1dd 修复
廖金灵 05444593b5 Merge branch 'feature/fee_form' of wmtx/platform into release
ios下载账号隐藏中间部分
zhengyongxing b32910a79e ios下载账号隐藏中间部分
廖金灵 f8228ae41b Merge branch 'feature/PlatFormCoinData' of wmtx/platform into release
平台币统计bug修复
sunke 797102a556 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
sunke 5b74e65585 统计
廖金灵 a8d478b526 Merge branch 'feature/fee_form' of wmtx/platform into release
财务管理金额保留两位小数
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 测试资源配置状态添加
廖金灵 a6f82e5820 Merge branch 'feature/work_order' of wmtx/platform into release
修改默认评价分数为5分
廖金灵 4c8cb3c171 Merge branch 'feature/IOSdata' of wmtx/platform into release
修改bug
yulingwei 9eac722222 修改评分默认5分
sunke fea5f4d2d7 ios
廖金灵 bf80a2d99a Merge branch 'feature/download_type_list' of wmtx/platform into release
问题修复
yulingwei 132dee220a fix
廖金灵 c5376f8a64 Merge branch 'feature/PlatFormCoinData' of wmtx/platform into release
取消平台转移
sunke 9878ba45e5 取消平台转移
廖金灵 c2b57233a0 Merge branch 'feature/ip_forbit' of wmtx/platform into release
测试资源定时脚本修正
廖金灵 610e72bdd2 Merge branch 'feature/PlatFormCoinData' 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 修改超级签价格为配置