Commit Graph

13 Commits (86dd4a295296c76d91b55abbef1964d615f4e836)

Author SHA1 Message Date
zhengchanglong 7c7ec4fc1d Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
zhanglingsheng 24d47089dd 游戏预充值
zhengyongxing 6dc8366018 数据授权修改内容提交
zhanglingsheng eaf1cb3f17 游戏区服联动修改
zhanglingsheng 3a20c68117 游戏充值预下单修改
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框
yulingwei 046beee6be 修改bug
jbrazz 7396e69a61 upt
jbrazz 52880f1a91 upt
jbrazz 48de85a3c3 upt
jbrazz 459b722c1c upt
jbrazz 736c0fd432 fix
ELF 2ffa024c4c initial