Merge branch 'developer'

姜友瑶

2022-08-09 c423224dbe37ea69c1a36c696f85490343e68c4c

 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java

@@ -39,7 +39,7 @@
    */
   public int remove(List<Long> list);

   public int cancelOrder(Long id);
   public void cancelOrder(Long id);
   /**
    * 根据id删除SysOrder
    *
@@ -145,4 +145,5 @@

   BigDecimal findVipArrearsByVipId(Long vipId);

    List<SysOrder> findByIds(List<Long> orderIds);
}