Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-03-08 ca982eb586579947e6fcfc0b6a2231b3c29fc91b

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

  
}