分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 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,