分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 cnas-require/src/main/resources/mapper/DeviceFaultOneMapper.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.DeviceFaultOneMapper">
<mapper namespace="com.ruoyi.require.mapper.DeviceFaultOneMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.DeviceFaultOne">
    <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.DeviceFaultOne">
        <id column="id" property="id" />
        <result column="device_id" property="deviceId" />
        <result column="process_number" property="processNumber" />
@@ -35,7 +35,7 @@
        <result column="create_time" property="createTime" />
    </resultMap>

    <select id="deviceFaultOnePage" resultType="com.ruoyi.requier.dto.DeviceFaultOneDto">
    <select id="deviceFaultOnePage" resultType="com.ruoyi.require.dto.DeviceFaultOneDto">
        select dfo.*,
               d.device_name,
               d.management_number,