Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WxServiceImpl.java

@@ -122,7 +122,8 @@ public class WxServiceImpl implements IWxService {
 
         // 当前用户已经与其他微信做过绑定，先解绑
         UserAuthorize userAuthorizeTmp = userAuthorizeMapper.selectOne(Wrappers.<UserAuthorize>lambdaQuery()
-                .eq(UserAuthorize::getUserId, userId)
+                .ne(UserAuthorize::getUserId, userId)
+                .eq(UserAuthorize::getOpenId, openid)
                 .eq(UserAuthorize::getMark, MarkEnum.VALID.getCode()));
         if (ObjectUtil.isNotEmpty(userAuthorizeTmp)) {
             log.info("该用户已做绑定，先进行解绑, userId={}，openid={}", userId, openid);