From 17848d94d06a5e362c03c020735476f1f2295b95 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 00:21:47 +0800
Subject: [PATCH] 解决冲突

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IMessageNotificationService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IMessageNotificationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IMessageNotificationService.java
index bb862a0..659ccb1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IMessageNotificationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IMessageNotificationService.java
@@ -1,8 +1,11 @@
 package com.panzhihua.sangeshenbian.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.sangeshenbian.model.MessageNotification;
+import com.panzhihua.sangeshenbian.model.entity.MessageNotification;
+import com.panzhihua.sangeshenbian.model.query.BasePage;
+import com.panzhihua.sangeshenbian.model.vo.MessageNotificationVO;
 import com.panzhihua.sangeshenbian.warpper.MessageNotificationList;
 
 /**
@@ -13,4 +16,6 @@
 	
 	
 	IPage<MessageNotification> list(MessageNotificationList query);
+
+    Page<MessageNotificationVO> getMessageList(BasePage page, Long userId);
 }

--
Gitblit v1.7.1