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

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

@@ -363,6 +363,7 @@ public class CommonRatingServiceImpl extends ServiceImpl<CommonRatingMapper, Com
         List<CommonRating> commonRatings = commonRatingMapper.selectList(wrapper);
         List<Long> collect = commonRatings.stream().map(x -> x.getId()).collect(Collectors.toList());
         // 查询没有回复的评价数量
+        wrapper.eq(CommonRating::getDeleteFlag,0);
         Integer noReplyCount = commonRatingMapper.getRatingWithNoReply(wrapper);
 
         // 如果为空直接返回