Merge branch 'sit' into sit-OrderFood

alien-store/src/main/java/shop/alien/store/service/impl/CommonCommentServiceImpl.java

@@ -290,10 +290,10 @@ public class CommonCommentServiceImpl extends ServiceImpl<CommonCommentMapper, C
                 map.put("isLike",0);
             }
             // 4.查询当前登录人是否关注了动态发布者
-
+            log.info("查询当前登录人是否关注了动态发布者，动态发布者id：{}，当前登录人id：{}", lifeUserDynamics.getPhoneId(), lifeUser.getUserPhone());
             LifeFans lifeFans = lifeFansMapper.selectOne(new QueryWrapper<LifeFans>().eq("followed_id", lifeUserDynamics.getPhoneId())
                     .eq("fans_id", "user_".concat(lifeUser.getUserPhone()))
-                    .eq("fans_type", 1)
+//                    .eq("fans_type", 1)
                     .last("limit 1"));
             if(null != lifeFans){
                 map.put("isFans",1);