Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-13 ee0fc4d9b4412cc1c0365b8ac7dd43b78f98a038

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