Merge branch 'ty_fix' of http://120.27.238.55:7000/r/beauty-erp into ty_fix

Helius

2021-11-30 d4c997972509c2da06b1128086b1735597823d3f

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java

@@ -46,7 +46,7 @@
    */
   public List<SysOrderItem> selectByOrderId(@Param("orderId") Long orderId);

   public Integer selectByGoodsId(@Param("goodsId") Long goodsId);
   public Integer selectByGoodsId(@Param("goodsId") Long goodsId,@Param("vipId") Long vipId);

   public List<SysOrderItem> selectItemByTime(@Param("shopId")Long shopId, @Param("time")Date time);