Merge remote-tracking branch 'origin/develop-yellow' into develop2

# Conflicts:
#	src/custom/restcontroller/common/usercenter/usercenter.java

src/custom/restcontroller/common/usercenter/usercenter.java

@@ -328,7 +328,7 @@ public class usercenter extends Controller {
             }
 
             Rows unionidsRows = dbConnect.runSqlQuery("select * from sys_wechatapp_unionids where userid='" + userid + "'");
-            if (unionidsRows.isNotEmpty()) {
+            if ( unionidsRows.isNotEmpty()) {
                 if (!unionidsRows.get(0).getString("unionid").equals(unionid)) {
                     return getErrReturnObject().setErrMsg("当前账号已绑定微信，如需绑定其他微信，请先进行解绑操作！").toJSONString();
                 }
@@ -387,6 +387,7 @@ public class usercenter extends Controller {
             updateSQL.setValue("userid", userid);
             updateSQL.update();
             if (usertype == 99) {
+
                 new StoreHelper().updateUserType22(this);
             }
 
@@ -402,10 +403,8 @@ public class usercenter extends Controller {
                 new StoreHelper().updateUserType99(this);
             }
         }
-
-        dbConnect.runSqlUpdate(sqllist);
-        return getSucReturnObject().toString();
-
+            dbConnect.runSqlUpdate(sqllist);
+            return getSucReturnObject().toString();
     }
 
     @API(title = "微信公众号绑定", accesstoken = false)