Merge branch 'v2' of http://git.gdatac.com/hooloo/ms/soss into v2

soss-system/src/main/resources/mapper/system/GoodsSkuMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         case when sgs.discount>=0 then sgs.discount else gs.discount end as discount,
         gs.is_deleted from goods_sku gs
         left join shop_goods_sku sgs on gs.goods_id = sgs.goods_id
-        where id in
+        where gs.id in
         <foreach collection="ids" item="id" separator="," open="(" close=")">#{id}</foreach>
     </select>