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/ReservationMapper.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cnas-require/src/main/resources/mapper/ReservationMapper.xml b/cnas-require/src/main/resources/mapper/ReservationMapper.xml index 1ccb536..9823c1c 100644 --- a/cnas-require/src/main/resources/mapper/ReservationMapper.xml +++ b/cnas-require/src/main/resources/mapper/ReservationMapper.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.ReservationMapper"> +<mapper namespace="com.ruoyi.require.mapper.ReservationMapper"> <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> - <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.Reservation"> + <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.Reservation"> <id column="id" property="id" /> <result column="device_id" property="deviceId" /> <result column="device_name" property="deviceName" /> @@ -19,7 +19,7 @@ </resultMap> - <select id="selectReservationParameterPage" resultType="com.ruoyi.requier.dto.ReservationDto"> + <select id="selectReservationParameterPage" resultType="com.ruoyi.require.dto.ReservationDto"> SELECT a.id, a.create_date, -- Gitblit v1.9.3