From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 11:42:38 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/dao/SysBeauticianStateDao.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysBeauticianStateDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysBeauticianStateDao.java
index c701b27..6a318c6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysBeauticianStateDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysBeauticianStateDao.java
@@ -2,6 +2,7 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.hive.bean.SysBeauticianState;
+import com.matrix.system.hive.bean.SysProjUse;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
@@ -73,5 +74,8 @@
public int summaryItemDetailTotal(Map<String,Object> obj);
+ List<SysBeauticianState> selectByProjUse(@Param("list") List<SysProjUse> list, @Param("state") String state);
+
+ List<SysBeauticianState> selectBeauticianStateByPuseIdAndNoStatus(@Param("puseId") Long puseId, @Param("state") String state);
}
\ No newline at end of file
--
Gitblit v1.9.1