Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-25 b02836d6cdcc2092eb6a864f52c90379e4d171b9

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

  
}