Commit Graph

1382 Commits (b7fdcf38f691bfe6a67eaa23f6931032406067d3)

Author SHA1 Message Date
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl
zhengyongxing 08b2ba432a 统计数据修正
sunke dd7a55bf38 账号修改
sunke a770dc14e5 安全中心
sunke e244b43c92 推广员账号
zhengchanglong b432423068 Merge branch 'dev_zcl' into dev
zhengchanglong 28ab1af0b8 Merge branch 'dev-cz' into dev_zcl
chenzhi e9e718abbb 同上
chenzhi 0e72821a89 修改推广后台平台币充值手续费费率
sunke f4bf575663 时间格式
sunke bfb236892c 提交方式
sunke 5a83adb06d 下载注释
sunke 193631bbb2 大小写问题
ELF 51d1d730e1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c0f19228d2 修改bug
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新
yulingwei 26d0d0d6cb merge
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新
yulingwei a9f06b1d57 修改批量锁定问题
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
zhengchanglong 3f869ccb2e Merge branch 'dev-cz' into dev
# Conflicts:
#	Data/update.sql
chenzhi df03c05651 修正统计bug
zhengyongxing 118f706440 脚本去除部分输出
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
chenxiaojun 0e81ba6401 推广平台->数据管理--标题调整
chenxiaojun 7e0cd3c297 推广平台->数据管理--标题调整
chenxiaojun 21070ac3a4 推广平台->财务管理--标题调整
chenxiaojun 0f5da378fc 推广平台->财务管理--标题调整
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
chenzhi 2a417c2746 123
sunke b73472fd9d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
sunke 426d8e4fae bug
ELF 6403bc9859 修改
ELF d2cb9b9a2b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 0b4416f057 修改bug
chenzhi e61a8af93d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 313cd11796 恢复
ELF 9d5b0e235a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 639e7117b8 修改bug
chenzhi 4ecbec2f49 回掉1.0
chenzhi 48be6af89b 回掉0.4
chenzhi f8f5c3b4e0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 222b9d2ec6 回0.3
ELF 2abdcd6147 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF de00fe5e48 修改bug
chenzhi 13700e6123 回调0.2
chenzhi 397eab9c30 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi ca5fe30969 回调0.1
ELF 2254610041 修改bug