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

src/main/resources/mapper/ProductMapper.xml

@@ -56,7 +56,6 @@
         left join province as pr on ci.provinceID = pr.provinceID
 
 		where p.productID = #{productId}
-		and p.validFlag in (2,3,10)
 	</select>
 	<select id="getProductRecommendsById" resultType="com.caimei.www.pojo.page.ProductList">
         select