From d122f3323cea1953ea443653f13ece07f94fb05b Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Thu, 05 May 2022 07:35:10 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/java/com/matrix/beauty/followup/dao/SysFollowupDao.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysFollowupDao.java b/zq-erp/src/main/java/com/matrix/beauty/followup/dao/SysFollowupDao.java
similarity index 84%
rename from zq-erp/src/main/java/com/matrix/system/hive/dao/SysFollowupDao.java
rename to zq-erp/src/main/java/com/matrix/beauty/followup/dao/SysFollowupDao.java
index 28fafcb..8da6244 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysFollowupDao.java
+++ b/zq-erp/src/main/java/com/matrix/beauty/followup/dao/SysFollowupDao.java
@@ -1,11 +1,13 @@
-package com.matrix.system.hive.dao;
+package com.matrix.beauty.followup.dao;
 
+import com.matrix.beauty.followup.entry.SysFollowup;
+import com.matrix.core.pojo.PaginationVO;
 import com.matrix.system.app.dto.FollowupListDto;
+import com.matrix.system.hive.dto.FollowuListDto;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
-import com.matrix.core.pojo.PaginationVO;
-import com.matrix.system.hive.bean.SysFollowup;
 
 /**
  * @description 跟进
@@ -15,7 +17,7 @@
 public interface SysFollowupDao{
 
 	public int insert(@Param("item") SysFollowup sysFollowup);
-   	
+
    	public int batchInsert(@Param("list") List<SysFollowup> sysFollowupList);
    	
 	public int updateByMap(Map<String, Object> modifyMap);
@@ -41,4 +43,6 @@
     void updateZan(@Param("id")Long id, @Param("zans")String zans);
 
 	List<SysFollowup> selectByAppDto(FollowupListDto followupListDto);
+
+    List<SysFollowup> findVipFollowuByPage(FollowuListDto followuListDto);
 }
\ No newline at end of file

--
Gitblit v1.9.1