Commit Graph

3425 Commits (ad901c31db1152a33f4586da7cab8663be889bdd)
 

Author SHA1 Message Date
liuweiwen 7b87c7718d 游戏统计搜索时间范围
chenzhi cceae049bb Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi d1cca460be 优化公会统计游戏搜索框
zhanglingsheng 087a935c45 补单记录
zhanglingsheng 93123b3b95 订单记录
ELF de81412aef Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 88c1cdcd1b 解决冲突
tping 5af705c2f9 通知到账
廖金灵 5bed2f8809 Merge branch 'release-1.0.0' of wmtx/platform into master
优化补链记录
liuweiwen 26726f32bf 游戏统计下拉框改为select2
zhengyongxing e4f49e91c2 Merge branch 'dev_statistics' into dev
zhengyongxing 7eb430f746 渠道统计bug修正
ELF da5e8b9050 修改
zhengchanglong 42c508edee Merge remote-tracking branch 'origin/dev' into dev
ELF 67dd874ccf 修改
chenzhi 5f70aa78d8 优化补链记录
zhengchanglong 616c7f583f Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Data/update.sql
zhengyongxing 27b4eaded5 Merge branch 'dev_statistics' into dev
zhengyongxing 261adfa33c 渠道统计bug修正
zhengyongxing 6e5cfb72b4 渠道统计bug修正
zhengyongxing 4068c12480 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 3dbab290e6 Merge branch 'dev_statistics' into dev
zhengyongxing e506f45ed2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 44dac56d85 渠道统计bug修正
chenzhi 9dcc55d472 优化用户列表选择设备无响应问题
廖金灵 920e0d7761 Merge branch 'release-1.0.0' of wmtx/platform into master
修改管理后台bug
chenzhi 116dc2c86f 优化三角色说明
chenzhi 1f4490733a 优化推广员注册用户
廖金灵 6944f26afd Merge branch 'release-1.0.0' of wmtx/platform into master
修改后台bug
chenzhi 0cec46ed37 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 8c577ec4af 新增平台统计说明
liuweiwen 9ac0277f82 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen cfd032b1fa 推广员统计
chenzhi 7a82b930bf 优化区服选择不响应问题
chenzhi 8b968fc9fb 优化区服选择无效问题
chenzhi c0a0f44287 优化推广员注册统计->区服选择不相应bug
廖金灵 e010178168 Merge branch 'release-1.0.0' of wmtx/platform into master
后台权限功能上线
ELF 8d934c8d88 修改
liuweiwen 8c7107ddd2 更新sql语句
chenxiaojun 92b0bc2c87 公会分成管理--更新
chenxiaojun ec273ab157 公会分成管理--更新
zhengyongxing 66d098a81b 数据权限跳转提示去除,直接跳转
chenzhi 6241fb427d 修改添加管理员密码key不同问题
liuweiwen 3e5dbd6571 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 20bee7bbc9 管理后台登录时间改为1小时
chenzhi 0890e39675 公会统计首页新增分页
chenzhi 85e474c299 公会统计首页新增分页
chenzhi 4dc8a8cb6d 优化导出为新开一个窗口
chenzhi cf89e73281 优化csv导出函数
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev