Merge branch 'ty_fix' into alpha

Helius

2021-11-08 64944a0dfd639a5c335d22f8230a64bf875f284f

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

}