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

src/main/resources/mapper/BaikeMapper.xml

@@ -39,7 +39,7 @@
 		from cm_baike_product a
 				 left join cm_baike_type cbt on a.typeId = cbt.id
 			left join shop s on a.shopId = s.shopID
-		where a.id = #{productId} and a.status = 1 and NOW() > publishTime;
+		where a.id = #{productId} and a.status = 1 and a.auditStatus = 2 and a.onlineStatus = 2 and NOW() > publishTime;
 	</select>
 
 	<select id="findParamList" resultType="com.caimei.www.pojo.baike.BaikeProductParam">