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

admin

2019-10-25 14f8255006245ab8473d3b0c755e76f9e9b8148f

 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, "微信帐号一致无需更换");

      }