From 8243c06e629d79bba0388e6fb4f0e1ae70281ded Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Mar 2022 12:30:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into feature/订单服务单代码改造

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysBeauticianStateService.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 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 5904b62..4566825 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
@@ -1,12 +1,11 @@
 package com.matrix.system.hive.service;
 
-import java.util.Date;
-import java.util.List;
-
-
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.system.hive.bean.SysBeauticianState;
 import com.matrix.system.hive.plugin.util.BaseServices;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -75,7 +74,7 @@
 	public List<SysBeauticianState> findByTimeAndStaff(Long id, Date beginTime, Date endTime);
 
 
-   	public List<SysBeauticianState> findBySerId(Long serviceId);
+	public List<SysBeauticianState> findBySerId(Long serviceId);
 
   
 }
\ No newline at end of file

--
Gitblit v1.9.1