分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

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

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.DataConfig">
    <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.DataConfig">
        <id column="id" property="id" />
        <result column="formula" property="formula" />
        <result column="referx" property="referx" />
@@ -12,7 +12,7 @@
        <result column="y" property="y" />
    </resultMap>

    <select id="selectDataConfigList" resultType="com.ruoyi.requier.dto.DeviceConfigDtoPage">
    <select id="selectDataConfigList" resultType="com.ruoyi.require.dto.DeviceConfigDtoPage">
        SELECT d.device_name,
               d.file_type,
               d.collect_url,