Merge remote-tracking branch 'origin/developer' into developerH

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -579,7 +579,7 @@
             AND p.newvalidFlag = 1
             AND p.newProductType=1
             AND p.validFlag = 2
-            AND p.showFlag!=2
+#             AND p.showFlag!=2
 
         </where>
         # 在设置重点关注时给排序值1000为了让重点关注始终在列表前端