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

jyy

2021-01-27 19dc607fe5fd18531d6deaa4fe8540b602585723

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysBeauticianStateServiceImpl.java

@@ -93,7 +93,9 @@
   
      return sysBeauticianStateDao.selectByTimeAndStaff(id,beginTime,endTime);
   }
	
   	
	

   @Override
   public List<SysBeauticianState> findBySerId(Long serviceId) {
      return sysBeauticianStateDao.selectBySerIds(serviceId);
   }
}