解决冲突问题

nightFragrance-massage/src/main/resources/mapper/project/ProjectMapper.xml

@@ -200,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <!-- 查询全部上架有效项目及实时完成订单销量 -->
-    <!--<select id="selectAllProjectSalesCount" resultType="com.ylx.home.hot.domain.vo.ProjectSalesVO">
+    <select id="selectAllProjectSalesCount" resultType="com.ylx.home.hot.domain.vo.ProjectSalesVO">
         SELECT
             p.id AS id,
             COALESCE(COUNT(o.id), 0) AS salesCount
@@ -211,7 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE p.is_delete = 0
           AND p.status = 0
         GROUP BY p.id
-    </select>-->
+    </select>
 
     <update id="batchUpdateSales">
         UPDATE project