Merge branch 'subsidy_sku_func' into pre

netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -514,7 +514,7 @@
 
     <select id="getPayGoodsIds" resultType="java.lang.Long">
         select distinct goods_id from order_don where status not in ('close','noPayment')
-        where user_id in
+        and user_id in
         <foreach collection="userIds" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>