Commit Graph

38 Commits (77a389276604f811cef6eebd7c57b531b70946f9)

Author SHA1 Message Date
yulingwei ee7bb128c0 修复
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化
yulingwei a7f6d8b7a4 upt
elf@home 1036589f3b 修改代码
chenxiaojun 9075730d83 管理后台->游戏订单->游戏充值--更新
chenxiaojun 3fbdc9daa0 管理后台->游戏订单->游戏充值--sql优化
ELF 905efbfd9a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c8f072f983 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
jbrazz 2a6d9b7571 推广员名称
chenxiaojun 9d3dfd622b 推广平台->退出登录--更新
chenxiaojun 467b193037 推广平台->退出登录--更新
ELF 6bf4e10916 Merge branch 'hotfix/oa' of 47.111.118.107:/srv/git/platform into dev
Your Name a9a95765e2 OA获取信息-手机系统变更消息推送
jbrazz b21df0a8f4 upt
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c9996e071c fix grand_id
ELF 831456b333 解决冲突
jbrazz 9300280f78 merge feture/ylw
jbrazz 48b1cdf66f upt
jbrazz a8125bf377 upt
jbrazz 48de85a3c3 upt
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev
jbrazz b78c6228b0 Merge branch 'hotfix/fix_bug' into dev
jbrazz 8859c847f6 upt
sunke 692a1bcc11 webuploader插件
zyx b39efb2d18 同步代码
zyx 112316c395 财务管理功能添加
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev
jbrazz 736c0fd432 fix
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi e3d9d382d9 新增线下充值审核
zhengchanglong 6154654a35 SDK登录BUG修复
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正
Your Name abbed4b177 sdk chinaChar
ELF 2f3bec1975 修改bug
ELF 2ffa024c4c initial