Merge remote-tracking branch 'origin/developerA' into developerC

src/main/resources/mapper/PageMapper.xml

@@ -713,7 +713,7 @@
         select id as productId, commodityType, image, name, discription, publishTime, (basePv + actualPv) as pv
         from cm_baike_product
         <where>
-            status = 1 and NOW() > publishTime
+            status = 1 and NOW() > publishTime and delFlag = 0
             <if test="typeId != null">
                 and typeId = #{typeId}
             </if>