From 0d1a73f4c0d35951dc42f0e35526d69c0e922afc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 十月 2025 15:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/resources/mapper/system/DrDisplacementMapper.xml |   35 -----------------------------------
 1 files changed, 0 insertions(+), 35 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/DrDisplacementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DrDisplacementMapper.xml
index cd24fbb..6f00ac4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DrDisplacementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DrDisplacementMapper.xml
@@ -2,39 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.DrDisplacementMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.DrDisplacement">
-        <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="phone" property="phone" />
-        <result column="community_id" property="communityId" />
-        <result column="community_name" property="communityName" />
-        <result column="id_card" property="idCard" />
-        <result column="address" property="address" />
-        <result column="total_area" property="totalArea" />
-        <result column="is_settlement" property="isSettlement" />
-        <result column="house_type" property="houseType" />
-        <result column="resettlement_mode" property="resettlementMode" />
-        <result column="house_compensation" property="houseCompensation" />
-        <result column="facility_compensation" property="facilityCompensation" />
-        <result column="other_compensation" property="otherCompensation" />
-        <result column="transition_allowance" property="transitionAllowance" />
-        <result column="moving_fee" property="movingFee" />
-        <result column="total_compensation" property="totalCompensation" />
-        <result column="agreement_date" property="agreementDate" />
-        <result column="settlement_community" property="settlementCommunity" />
-        <result column="person_count" property="personCount" />
-        <result column="attachment_urls" property="attachmentUrls" />
-        <result column="create_time" property="createTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="disabled" property="disabled" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, phone, community_id, community_name, id_card, address, total_area, is_settlement, house_type, resettlement_mode, house_compensation, facility_compensation, other_compensation, transition_allowance, moving_fee, total_compensation, agreement_date, settlement_community, person_count, attachment_urls, create_time, create_by, update_time, update_by, disabled
-    </sql>
-
 </mapper>

--
Gitblit v1.7.1