Merge remote-tracking branch 'origin/master'

JiangYouYao

2022-03-15 bbc374ae6a80b111bb9d3056a065d8c5f6cd143e

 zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignAwardSetDao.java

@@ -17,4 +17,10 @@

   List<ActivitySignAwardSetVo> selectListByActIDAndCompanyId(@Param("actId")Long actId, @Param("companyId")Long companyId,@Param("awardState")int awardstateWork);

   List<ActivitySignAwardSetVo> selectListByActIDAndCompanyIdAndAwardType(@Param("actId")Long actId, @Param("companyId")Long companyId
         ,@Param("awardState")int awardstateWork,@Param("awardRule")int awardRule);

   List<ActivitySignAwardSet> selectActivitySignAwardSetByActIDAndCompanyIdAndAwardType(@Param("actId")Long actId, @Param("companyId")Long companyId
         ,@Param("awardState")int awardstateWork,@Param("awardRule")int awardRule);

}