Commit Graph

3492 Commits (015e7bc506a59f5e9839921d7130aab250968009)
 

Author SHA1 Message Date
chenzhi 9faec272e3 优化订单判断
chenzhi 3e54338685 取消多个推广员无法补链注释
chenzhi 3f53bc266b Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 878badef43 换绑新增判断渠道是否已经结算
chenxiaojun a9718b013e 更新
chenxiaojun c3bd0e5a2b 渠道结算
ELF 166b21fcc0 Merge branch 'hotfix/shift_player_selle' into dev
ELF 91d4c9f753 补链/玩家迁移排除已结算订单(cp结算)
chenzhi bb7e1c269c Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 876952f3b4 公会统计新增内外团检索
chenxiaojun 5b4081b77d 更新
chenxiaojun 89965bd8fb 导出
chenxiaojun a636c2dcf6 导出
zhengchanglong 715abb2b3e Merge branch 'hotfix/fix_get_gameist' into dev
liuweiwen fe0f308e54 财务管理下的ajax请求不判断权限
chenxiaojun ba1f6565cc 更新
chenxiaojun 631c23568d 上传汇款证明--调整
chenxiaojun d792e34348 结算管理--更新
chenxiaojun 90eed6f5ca 结算管理--更新
chenxiaojun 8b7d592340 结算管理--更新
chenxiaojun 461e80bd30 结算管理--更新
chenxiaojun 3faf5db4f7 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenxiaojun c074b5fb86 结算管理--更新
chenzhi 3840959f05 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi a37d0d6ec4 优化推广员充值统计排序问题
chenzhi 9cef29ebeb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 43774e9099 推广员充值统计新增官方渠道统计
chenxiaojun 4721e60d32 推广员资质认证
chenzhi 4ba400fa78 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
chenzhi 14fa967f00 优化推广员统计数据
chenxiaojun 0ff9f77181 推广员资质认证
zhengchanglong 7c1593e0e1 Merge branch 'feature/group_type' into dev
zhengyongxing 302ee7a2ca Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 5343ef2162 工会统计新增内外团
chenzhi 0caa548525 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi 836eccfa78 支付渠道新增支付渠道比
zhengyongxing acd816c766 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing cc0f5a03c4 工会统计新增内外团导出
chenzhi 07f6e9919d 区服列表 区服名称改区服id
ELF 7c5b3bb5e7 Merge branch 'feature/account_safe' into dev
chenzhi 0f7134c838 游戏充值 区服名称改区服id
ELF 4fb2c35495 Merge branch 'hotfix/link_info' into dev
chenzhi 3bf288fa41 优化登陆记录区服名称为区服id
chenzhi 5e08bda6c2 优化行为日志区服名称为区服id
ELF 0a0cedafd5 各个系统登录提示安全优化,sessionon_id变更
zhengchanglong 10c0b3a18a Merge branch 'feature/group_type' into dev
# Conflicts:
#	Application/Admin/Controller/PromoteController.class.php
#	Data/update.sql
chenzhi 432c84ba01 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi e39c811da8 修改月结月份显示错误问题
zhanglingsheng 5ea753b595 支付宝设置添加公钥私钥
liuweiwen 4addf4c281 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type