3356 Commits (1c8f0d446454666560e337e806b0edfb3a8749bc)
 

Author SHA1 Message Date
ELF 050ecd3bc4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 254022ed6d Merge branch 'hotfix/mend_amount' into dev 5 years ago
ELF bb2996dbee 迁移忽略结算 5 years ago
chenxiaojun ce9a7f1bc0 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 0a7973ae3c 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun d835c75caa Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun 64eb3ce4cb 推广平台>数据管理>充值玩家--更新 5 years ago
zhanglingsheng 8a1a65c771 sql添加行为日志菜单 5 years ago
zhanglingsheng f6b39c3a66 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 701bb6a818 sql添加行为日志菜单 5 years ago
chenxiaojun b27906d470 推广平台>数据管理>充值玩家--更新 5 years ago
chenzhi 1ccbd03a0f 超级签新增支付方式 5 years ago
sunke 49408030f0 行为日志 5 years ago
liuweiwen b992d5a744 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 98f7653f2a pc官网-》家长监护-》更换家长监护引导内容 5 years ago
zhanglingsheng 387fe5c007 支付信息修改字段 5 years ago
zhanglingsheng cf7440e87e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng ad97083c9f 行为日志文案 5 years ago
zhengyongxing f225cff461 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
5 years ago
ljl360197197 fad670e04f Merge branch 'hotfix/testgogs' of ljl360197197/plaform into dev 5 years ago
ELF 15ece7ce09 Merge branch 'hotfix/testgogs' 5 years ago
ELF a120ce86b4 删除phpinfo 5 years ago
chenxiaojun a389f9a245 推广平台>落地页>安卓添加视频 5 years ago
chenxiaojun ff2481cdc4 推广平台>落地页>安卓添加视频 5 years ago
chenzhi 08a97a2f9f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
ELF 991861e488 解决冲突 5 years ago
ELF 8fb63d03d5 Merge branch 'hotfix/mend_amount' into dev 5 years ago
ELF 289b40329f 添加换绑时金额 5 years ago
ELF 8bad35e081 Merge branch 'master' of 47.111.118.107:/srv/git/platform into hotfix/mend_amount 5 years ago
chenzhi 0c62e80e67 优化总览表格高度 5 years ago
zhengyongxing c1b446ba9a 管理后台新开发功能修改 5 years ago
zhengyongxing f112364f63 超级签功能bug修改 5 years ago
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 1bf6adb6c7 优化用户列表默认时间 5 years ago
zhengyongxing 11177b895c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
tpingzhang 46dda0848f 合服 用户行为 5 years ago
liuweiwen 48ae252b4e 游戏表增加字段视频是否置顶 5 years ago
liuweiwen f8df1d57dd Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen 188abdcbdd 落地页视频置顶判断 5 years ago
zhengyongxing 7b12780d9c 管理后台新开发功能修改 5 years ago
zhengyongxing 976a697b24 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
ELF 66b62cc88f Merge branch 'hotfix/admin_change_pack' 5 years ago
chenxiaojun 3b5a915bda 推广平台>数据管理>订单查询--更新 5 years ago
chenzhi 1010fe2674 推广补链新增查询条件 5 years ago
chenzhi 3d672db381 推广补链新增一系列查询条件 5 years ago
ELF c61a3e200a 解决冲突 5 years ago
ELF 6f7a930c25 修改数据库 5 years ago
ELF c451921b92 后台添加IOS打包方式选择 5 years ago
liuweiwen cdeea23034 Merge remote-tracking branch 'origin/dev' into dev 5 years ago