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/FeTempHumRecordMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml b/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml
index 095bb33..425338a 100644
--- a/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeTempHumRecordMapper.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.FeTempHumRecordMapper">
+<mapper namespace="com.ruoyi.require.mapper.FeTempHumRecordMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.FeTempHumRecord">
+ <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeTempHumRecord">
<id column="temp_hum_id" property="tempHumId" />
<result column="morning_test_time" property="morningTestTime" />
<result column="morning_temp" property="morningTemp" />
@@ -15,7 +15,7 @@
<result column="note" property="note" />
</resultMap>
- <select id="getFeTempHumRecordPage" resultType="com.ruoyi.requier.dto.FeTempHumRecordDto">
+ <select id="getFeTempHumRecordPage" resultType="com.ruoyi.require.dto.FeTempHumRecordDto">
select c.*, u1.name afternoon_recorder_user, u2.name morning_recorder_user
from cnas_fe_temp_hum_record c
left join user u1 on u1.id = c.afternoon_recorder_id
--
Gitblit v1.9.3