Merge branch 'ty_fix' into alpha

Helius

2021-11-09 51c026156e7e0cd75805ef7b61f6dc6eeab7afb6

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

  
}