Merge remote-tracking branch 'origin/score_shop' into score_shop

xiaoyong931011

2021-03-11 7387cb3e2f9e8b588c7be30b129faeee4050034d

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

  
}