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/FeCalibrationScheduleMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml b/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml
index bbdeeae..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,13 +23,13 @@
<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 != ''">
instrument_name like CONCAT('%', #{instrumentName}, '%')
</if>
- <if test="instrumentName != null and managementNumber != ''">
+ <if test="managementNumber != null and managementNumber != ''">
management_number like CONCAT('%', #{managementNumber}, '%')
</if>
</where>
--
Gitblit v1.9.3