From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-require/src/main/resources/mapper/InformationNotificationMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/InformationNotificationMapper.xml b/cnas-require/src/main/resources/mapper/InformationNotificationMapper.xml
index 63f77b4..4cf31a3 100644
--- a/cnas-require/src/main/resources/mapper/InformationNotificationMapper.xml
+++ b/cnas-require/src/main/resources/mapper/InformationNotificationMapper.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.requier.mapper.InformationNotificationMapper">
+<mapper namespace="com.ruoyi.require.mapper.InformationNotificationMapper">
- <select id="getPage" resultType="com.ruoyi.requier.dto.InformationNotificationDto">
+ <select id="getPage" resultType="com.ruoyi.require.dto.InformationNotificationDto">
select i.*, u.name senderUser, u2.name consigneeUser
from information_notification i
left join user u on i.sender_id = u.id
--
Gitblit v1.9.3