Merge branch 'developerB' of git.caimei365.com:chao/caimei-caimei365-www into developerB

src/main/resources/mapper/ProductMapper.xml

@@ -64,7 +64,7 @@
         from product as p
         left join cm_product_recommend as pr on pr.recommendProductID = p.productID
         where
-            p.productID = #{productId} and validFlag  = 2
+            pr.productID = #{productId} and p.validFlag  = 2
         order by pr.sort desc
 	</select>
 	<select id="getAutoProductRecommends" resultType="com.caimei.www.pojo.page.ProductList">