From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml b/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml
index 8485501..15d2948 100644
--- a/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.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.FeCalibrationScheduleMapper">
+<mapper namespace="com.ruoyi.require.mapper.FeCalibrationScheduleMapper">
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.FeCalibrationSchedule">
+    <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeCalibrationSchedule">
         <id column="id" property="id" />
         <result column="instrument_name" property="instrumentName" />
         <result column="model" property="model" />
@@ -23,7 +23,7 @@
         <result column="update_user" property="updateUser" />
         <result column="update_time" property="updateTime" />
     </resultMap>
-    <select id="ipage" resultType="com.ruoyi.requier.pojo.FeCalibrationSchedule">
+    <select id="ipage" resultType="com.ruoyi.require.pojo.FeCalibrationSchedule">
         select * from cnas_fe_calibration_schedule
         <where>
             <if test="instrumentName != null and instrumentName != ''">

--
Gitblit v1.9.3