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/FeIlluminationMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/FeIlluminationMapper.xml b/cnas-require/src/main/resources/mapper/FeIlluminationMapper.xml
index 8721bda..3103080 100644
--- a/cnas-require/src/main/resources/mapper/FeIlluminationMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeIlluminationMapper.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.FeIlluminationMapper">
+<mapper namespace="com.ruoyi.require.mapper.FeIlluminationMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.FeIllumination">
+ <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeIllumination">
<id column="intensity_illumination_id" property="intensityIlluminationId" />
<result column="device_id" property="deviceId" />
<result column="conclusion" property="conclusion" />
@@ -14,7 +14,7 @@
<result column="update_time" property="updateTime" />
</resultMap>
- <select id="getFeLightningProtection" resultType="com.ruoyi.requier.dto.FeIlluminationDto">
+ <select id="getFeLightningProtection" resultType="com.ruoyi.require.dto.FeIlluminationDto">
SELECT cdi.*, d.*, u1.name checker_user, u2.name tester_user, dv.device_name, dv.management_number
FROM cnas_fe_illumination cdi
left join device dv on dv.id = cdi.device_id
@@ -31,7 +31,7 @@
</select>
<!-- 鏌ヨ鐓ф槑璁板綍 -->
- <select id="selectFeIllumination" resultType="com.ruoyi.requier.dto.FeIlluminationExportDto">
+ <select id="selectFeIllumination" resultType="com.ruoyi.require.dto.FeIlluminationExportDto">
SELECT cdi.*,
dv.device_name,
dv.management_number,
--
Gitblit v1.9.3