Merge remote-tracking branch 'origin/div' into div

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -1306,7 +1306,7 @@
         if (newUser != null) {

            throw new UserAccountException(4, "该微信号已被其他帐号绑定");

         }

      } else if (wxUnionId.equals(wxUnionIdExist)) {

      } else if (wxUnionId.equalsIgnoreCase(wxUnionIdExist)) {

         throw new UserAccountException(3, "微信帐号一致无需更换");

      }