Merge branch 'score_shop' into api_score_meger

jyy

2021-06-19 e522e4d40451b4e46ec79b3d8a3891899196f14f

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