From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-manage/src/main/resources/mapper/InternalCorrectMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-manage/src/main/resources/mapper/InternalCorrectMapper.xml b/cnas-manage/src/main/resources/mapper/InternalCorrectMapper.xml
index 32e6f13..71efb96 100644
--- a/cnas-manage/src/main/resources/mapper/InternalCorrectMapper.xml
+++ b/cnas-manage/src/main/resources/mapper/InternalCorrectMapper.xml
@@ -1,6 +1,6 @@
<?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.yuanchu.mom.mapper.InternalCorrectMapper">
+<mapper namespace="com.ruoyi.manage.mapper.InternalCorrectMapper">
<select id="pageInternalAccording" resultType="com.ruoyi.manage.pojo.InternalCorrect">
select *
--
Gitblit v1.9.3