From e11162164d7b136e9de4c4b2e378b108cd87859f Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into developer

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysBeauticianStateService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysBeauticianStateService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysBeauticianStateService.java
index 17cf5ab..5904b62 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysBeauticianStateService.java
+++ b/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);
 
   
 }
\ No newline at end of file

--
Gitblit v1.9.1