Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

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

@@ -56,4 +56,7 @@
   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);
}