Merge branch 'developer'

Helius

2022-03-03 cf9bfc85093d4b7e5573422b8fd1a55c459b0d34

 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);