From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
index a846d23..eacab16 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
@@ -2,11 +2,13 @@
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysAnnouncementSend;
 import org.jeecg.modules.system.model.AnnouncementSendModel;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.vo.OptionsVo;
 
 /**
  * @Description: 鐢ㄦ埛閫氬憡闃呰鏍囪琛�
@@ -22,7 +24,7 @@
      * @return
      */
 	public List<String> queryByUserId(String userId);
-	
+
 	/**
 	 * 鑾峰彇鎴戠殑娑堟伅
 	 * @param announcementSendModel
@@ -36,6 +38,9 @@
 	 * @return
 	 */
 	AnnouncementSendModel getOne(String sendId);
-	
 
+	List<SysAnnouncementSend> getPrimaryInfo(String userId,List<String> msgCategoryList);
+
+
+	List<OptionsVo> getMessageType();
 }

--
Gitblit v1.9.3