Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-02-17 609e480a7ff25f285955910077416c2e4fea1023

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

@@ -75,7 +75,7 @@
   public List<SysBeauticianState> findByTimeAndStaff(Long id, Date beginTime, Date endTime);


   	
      public List<SysBeauticianState> findBySerId(Long serviceId);

  
}