Merge branch 'dev_689_更低价出售提醒' into test6.8.9

@@ -124,7 +124,7 @@
   </select>
   </select>
 
 
 
 
-  <select id="selectEntryListByUidStatusGBSkc" resultMap="BaseResultMap">
+  <select id="selectCanSellByStorageId" resultMap="BaseResultMap">
     SELECT <include refid="Base_Column_List" />
     SELECT <include refid="Base_Column_List" />
     FROM seller_order_goods
     FROM seller_order_goods
     WHERE storage_id = #{storageId,jdbcType=INTEGER} and status = 1
     WHERE storage_id = #{storageId,jdbcType=INTEGER} and status = 1