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/FeLightningProtectionMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/FeLightningProtectionMapper.xml b/cnas-require/src/main/resources/mapper/FeLightningProtectionMapper.xml
index c56edd3..4d3096d 100644
--- a/cnas-require/src/main/resources/mapper/FeLightningProtectionMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeLightningProtectionMapper.xml
@@ -1,9 +1,9 @@
<?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.FeLightningProtectionMapper">
+<mapper namespace="com.ruoyi.require.mapper.FeLightningProtectionMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.FeLightningProtection">
+ <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeLightningProtection">
<id column="lightning_protection_id" property="lightningProtectionId" />
<result column="file_name" property="fileName" />
<result column="system_file_name" property="systemFileName" />
@@ -14,7 +14,7 @@
<result column="update_time" property="updateTime" />
</resultMap>
- <select id="exportOfLightningProtectionDetection" resultType="com.ruoyi.requier.excel.FeLightningProtectionExcel">
+ <select id="exportOfLightningProtectionDetection" resultType="com.ruoyi.require.excel.FeLightningProtectionExcel">
select * from cnas_fe_lightning_protection
</select>
</mapper>
--
Gitblit v1.9.3