Merge branch 'developer'

Helius

2022-03-04 5483cb84845014996576909dbd3bc5ab6be5803b

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