Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform

@@ -77,10 +77,10 @@
     select id, product_name, product_code, max_sort_id, mid_sort_id, brand_id, series_id, 
     gender, sale_time, min_price, max_price, create_time, update_time, shelve_time, edit_time, 
     shelve_status, storage, key_words, del_status
-    from product where 1=1 <include refid="pageCondition" />  order by product.id desc limit #{start},#{rows}
+    from product where del_status=0 <include refid="pageCondition" />  order by product.id desc limit #{start},#{rows}
   </select>
   <select id="selectCount" resultType="java.lang.Integer">
-    select count(*) from product where 1=1 <include refid="pageCondition" />
+    select count(*) from product where del_status=0 <include refid="pageCondition" />
   </select>
   
   <sql id="pageCondition" >