63 Commits (177d8b45388ed074bb31fa28665640de118ca8db)

Author SHA1 Message Date
廖金灵 9222d99127 Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
5 years ago
chenzhi 55d49e8b4b 优化推广公会列表导出 5 years ago
廖金灵 09b04c502e Merge branch 'fix/member_user_info' of wmtx/platform into release
优化游戏统计弹框时间错误问题
5 years ago
chenzhi a5b73d82f5 回滚测试 5 years ago
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
5 years ago
sunke e94c64a881 平台币统计 5 years ago
chenzhi 76cd530239 优化获取子渠道基函数 5 years ago
chenzhi 71530c53e3 优化公会统计内充详情不符问题 5 years ago
zhengyongxing 61c2519ccd 单独判断admin 5 years ago
zhengyongxing b87dec3aee 管理员权限从用户改成以组的形式 5 years ago
ELF 423b4ae77b 解决冲突 5 years ago
liaojinling 843a429b43 下载添加部门/小组 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun 66a238dfd4 结算管理--更新 5 years ago
ELF 5c0a38c02a Merge branch 'feature/site_sms' into release 5 years ago
chenxiaojun 258e10c9d1 结算管理--更新 5 years ago
ELF e4daff1be8 修改短信接口 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
ELF f472f5e9d3 文件保存改成cdn 5 years ago
chenxiaojun c074b5fb86 结算管理--更新 5 years ago
chenxiaojun e884214546 会长提现|公会分成管理--更新 5 years ago
zhengchanglong 39b6e98f3b Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
#	Data/update.sql
5 years ago
chenxiaojun 116d1891a1 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 75faf37260 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun e9f9a421f5 管理后台>推广员管理>公会分成管理--更新 5 years ago
liuweiwen a9959e9544 解决推广员列表搜索底下推广员时自动过滤掉锁定的 5 years ago
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenzhi ff6c70e380 合并cz 5 years ago
zhanglingsheng 50dbc200e5 时间转换函数全部精确到秒 5 years ago
chenzhi df50ce6352 补链csv导出 5 years ago
chenzhi 5359e67860 优化补链记录为ajax 5 years ago
chenzhi 7cbec414db 实名认证8.0 5 years ago
chenzhi 6368693b48 实名6.0 5 years ago
chenzhi 250b9ab881 实名认证5.0 5 years ago
chenzhi c08a01d7e8 实名认证5.0 5 years ago
chenzhi 07e2940e62 实名认证接口设置 5 years ago
chenzhi dfff8b6240 优化推广员选择 5 years ago
chenxiaojun e0c0f50c7d 分成比例 5 years ago
zhengyongxing d386337922 管理中心重要的信息加密 5 years ago
zyx 0d090ded9b 礼包界面 5 years ago
jbrazz 31948423e0 upt 5 years ago
jbrazz 20c168a537 三级改四级配置 5 years ago
chenxiaojun 0787c976ef 管理后台->推广员->结算管理->推广提现--更新 5 years ago
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新 5 years ago
jbrazz b21df0a8f4 upt 5 years ago
chenzhi 58db110844 合并 5 years ago
chenzhi 115bafc067 新增补链日期及取消补链功能 5 years ago
ELF 831456b333 解决冲突 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago