分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 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,