Commit Graph

1120 Commits (f1428a8fe7fe9690de9a39c37e66ce633a1de5a9)

Author SHA1 Message Date
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi d7662eb305 推广员现在归属于公司团体
chenzhi dd86a85485 推广公会归属管理 改为公会归属不可选择
yulingwei 82620c9ae6 merge
yulingwei bec210c158 修复会员层级关系检索问题
chenzhi d7737291ed 暂存1
廖金灵 43562f6746 Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
yulingwei c40f5dda26 upt
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 充值财务管理金额保留小数点
廖金灵 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 7194cd49ae 平台币
廖金灵 21bf9744fb Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单苹果内购限制总开关去除
zhengyongxing 6ac97fa7b1 ip限制白名单页面去除内购总开关
廖金灵 112134ec93 Merge branch 'feature/work_order' of wmtx/platform into release
修改样式问题
廖金灵 e8282fc00c Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip白名单页面问题修正
zhengyongxing bd181dab51 ip限制白名单页面修改
yulingwei 3415ef8336 修改样式问题
sunke fd815ef5a6 html平台币
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit
 Conflicts:
	Data/update.sql
sunke e94c64a881 平台币统计
廖金灵 3be1bd78ed Merge branch 'feature/work_order' of wmtx/platform into release
工单管理
yulingwei 26f89f3c64 merge
廖金灵 aae20bce96 Merge branch 'feature/download_type_list' of wmtx/platform into release
修改下载统计bug
yulingwei f34975478b upt
廖金灵 a1f3c6e205 Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
廖金灵 e2a32b11dc Merge branch 'fix/member_user_info' of wmtx/platform into release
玩家列表新增去重数据栏
zhengyongxing e7aa7885e8 ip限制白名单提示语修改
zhengyongxing 1d27db663a ip限制白名单提示语修改
zhengyongxing 5f815370e8 ip限制白名单提交
sunke 41f6797e97 表格样式
sunke 7da471b6ee 支付时间
yulingwei 4afce87caa upt
yulingwei b56ba0b882 upt
yulingwei 823062c0f6 upt
yulingwei adf11e2b60 upt
yulingwei 175502e384 fix
yulingwei b10717e8b6 upt
chenzhi bfee0578d0 玩家列表新增去重数据栏
yulingwei 18b0c3024d upt
yulingwei ead4a8598e upt
yulingwei d9c338acd8 upt
chenzhi 381327ae21 优化游戏统计
chenzhi 45cad05508 优化用户列表统计数据
chenzhi 44afe1f65d 优化玩家列表统计方式及回退去重功能
yulingwei fa41426908 upt
yulingwei 1e3533720b utp
yulingwei b8fda2417a 工单管理
sunke 389ef7e967 bug修复
zhengyongxing 48239c0f13 测试订单bug修改
sunke 2ecb05d924 支付渠道统计
sunke 3edb0640ed 新增管理后台测试订单导出功能
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技
chenzhi 50b21f45ab Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 7fa400a0a5 优化公会统计统计栏样式
zhengyongxing 443abed206 Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
zhengyongxing 19d85f3717 测试资源可用余额接口修改
zhengyongxing caddcd1543 日志管理删除url开启
zhengyongxing 14c3d365e3 Merge branch 'feature/user_repeat' into release
zhengyongxing ffd6238bc1 测试订单bug修正
chenzhi cc3552b862 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi d0f07315da 操作日志前端检索名词修改
chenzhi 62c8c1e54d Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi dd0f930105 游戏预告-操作日志
zhengyongxing 0443871173 用户列表去除重复行
zhengyongxing 77ddb1eded Merge branch 'feature/operation_log' into release
zhengyongxing 31948abdf4 操作日志bug修正
liuweiwen 969bf4dc8a Merge branch 'feature/yibao_company' into release
# Conflicts:
#	Application/Admin/Common/extend.php
liuweiwen 5d596094a6 增加易宝支付
liuweiwen 3b415976eb 增加易宝支付
liuweiwen aa7e6fa0ec 推广公司新增与编辑减少必填项
chenzhi 31a0a174bd 后台发放-操作日志
liuweiwen c9d69414ba Merge branch 'hotfix/game_recharge_stat' into release
liuweiwen 22aa120ad6 去掉多余的换行
liuweiwen 1a4bf752c4 Merge remote-tracking branch 'origin/release' into release
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
liuweiwen b081544805 Merge branch 'hotfix/game_recharge_stat' into release
liuweiwen 4a45103650 平台币充值汇总补一列
zhengyongxing 5224eec9f2 上游结算单管理日志添加
liuweiwen 9221b18955 游戏统计汇总权限
zhengyongxing 5e794bd785 推广员日志记录添加
zhengyongxing 8aae878cf8 游戏统计修改
zhanglingsheng 9c39b731fd Merge branch 'release' of 47.111.118.107:wmtx/platform into release
zhanglingsheng dbd1e6f070 易宝支付配置
liuweiwen 94293b4bec Merge branch 'feature/resource_config' into release
liuweiwen b4fafbe0bf 修改配置比例范围
liuweiwen fa9746342f Merge remote-tracking branch 'origin/release' into release
liuweiwen cc8e2149e0 最低额度,最高额度,比例数据格式校验
zhengchanglong ba96083bb5 录入测试订单 时间控件修改
zhengyongxing a6a29bf63a 统计日志添加
chenzhi 55fd5d94e8 实名认证,防沉迷
liuweiwen 7d879686af 自动审核规则调整,锁定显示红色字体
chenzhi 50e4185d9c 操作日志-登陆记录
liuweiwen aa8d296dd8 推广后台-》测试资源申请-》符合规则的自动审核