Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java

@@ -56,4 +56,9 @@
   public List<ShopActivities> selectSalonActivityByUser(@Param("record") SalonVO salonVO);

   public IPage<ActivitiesListVo> findActivitiesList(Page<ActivitiesListVo> page, @Param("record")ActivitiesListDto activitiesListDto);

   public ShopActivities selectOneByCompanyIdAndActTypeAndActStatus(@Param("companyId")Long companyId, @Param("activitiesTypeSign")int activitiesTypeSign,
         @Param("actstatusStatusIng")int actstatusStatusIng);

   List<ShopActivities> selectOneByCompanyIdAndActType(@Param("companyId")Long companyId,@Param("activitiesTypeSign") int activitiesTypeSign);
}