Merge remote-tracking branch 'origin/score_shop' into developer

姜友瑶

2022-05-17 830b2eb4e8b7eef6e73fe65cde5331d914c28786

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

@@ -141,4 +141,8 @@


   public List<SysProjUse> selectTaocanProjUse(Long id, String status);

   public List<SysProjUse> findTaocaoProjUseWithProj(SysProjUse sysProjUse);

   int findTaocanCountForCourseAndInfinite(Long taocanId, Long vipId);
}