Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-07-07 1a987e34e395c32ec56937b2424c9f44308199a8

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

  
}