Merge branch 'dev-lic' of moonsflyer/zhengxin into master

app/admin/controller/setting/Register.php

@@ -23,7 +23,7 @@ class Register extends AdminBase
     {
         $post = $this->request->post();
         // ConfigServer::set('login','wechat_h5', $post['wechat_h5']);
-		// test
+		// test 再次测试1
         ConfigServer::set('register','captcha', $post['captcha']);
         ConfigServer::set('register','growth', $post['growth']);
         return JsonServer::success('设置成功');