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/DataConfigMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/DataConfigMapper.xml b/cnas-require/src/main/resources/mapper/DataConfigMapper.xml
index 4e18b71..f06c87a 100644
--- a/cnas-require/src/main/resources/mapper/DataConfigMapper.xml
+++ b/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,
--
Gitblit v1.9.3