From aeeec682325c7746f81d1694256430804c71a09e Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 13 Oct 2025 19:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/devchange/MaDevInfoMapper.xml | 15 ++++-----------
 .../mapper/material/ma/MaMachineTypeMapper.xml    |  3 ---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml
index bb7f975..22d0266 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml
@@ -4,7 +4,6 @@
     <resultMap id="BaseResultMap" type="com.bonus.material.devchange.domain.MaDevInfo">
         <id column="ma_id" property="maId"/>
         <result column="device_name" property="deviceName"/>
-        <result column="device_weight" property="deviceWeight"/>
         <result column="device_count" property="deviceCount"/>
         <result column="code" property="code"/>
         <result column="identify_code" property="identifyCode"/>
@@ -16,14 +15,12 @@
         <result column="item_type_model" property="modelName"/>
         <result column="production_date" property="productionDate"/>
         <result column="working_hours" property="workingHours"/>
-        <result column="month_lease_price" property="monthLeasePrice"/>
-        <result column="day_lease_price" property="dayLeasePrice"/>
         <result column="pic_url" property="picUrl"/>
         <result column="js_month_price" property="jsMonthPrice"/>
         <result column="js_day_price" property="jsDayPrice"/>
         <result column="description" property="description"/>
         <result column="gps_code" property="gpsCode"/>
-        <result column="own_co" property="ownCo"/>
+        <result column="on_company" property="ownCo"/>
         <result column="person" property="person"/>
         <result column="person_phone" property="personPhone"/>
         <result column="create_time" property="createTime"/>
@@ -38,13 +35,10 @@
         <result column="city_id" property="cityId"/>
         <result column="area_id" property="areaId"/>
         <result column="video_url" property="videoUrl"/>
-        <result column="own_id" property="ownId"/>
         <result column="check_date" property="checkDate"/>
         <result column="check_cycle" property="checkCycle"/>
         <result column="is_qc" property="isQc"/>
         <result column="is_safe_book" property="isSafeBook"/>
-        <result column="is_zone" property="isZone"/>
-        <result column="zone_id" property="zoneId"/>
         <result column="total_up_day" property="totalUpDay"/>
         <result column="total_lease_day" property="totalLeaseDay"/>
         <result column="origina_value" property="originaValue"/>
@@ -54,7 +48,6 @@
         <result column="up_down_status" jdbcType="CHAR" property="upDownStatus"/>
         <result column="json_data" property="jsonData"/>
         <result column="buy_price" property="buyPrice"/>
-        <result column="item_type_model" property="itemTypeModel"/>
         <result column="on_project" property="onProject"/>
         <result column="childGx" property="childGx"/>
         <result column="company_name" property="companyName"/>
@@ -70,10 +63,10 @@
 
     </resultMap>
     <sql id="Base_Column_List">
-        ma_id, device_name, device_weight, device_count, code, identify_code, type_id, ma_status,
+        ma_id, device_name, device_weight, device_count, `code`, identify_code, type_id, ma_status,
     lease_scope, `location`, brand, model_name, production_date, working_hours, serial_number,
-    month_lease_price, day_lease_price, pic_url, js_month_price, js_day_price, description,
-    gps_code, own_co, person, person_phone, create_time, creator, deposit, is_active,
+     pic_url, js_month_price, js_day_price, `description`,
+    gps_code, on_company, person, person_phone, create_time, creator, deposit, is_active,
     update_time, update_by, is_operator, specification, province_id, city_id, area_id,
     video_url, own_id, check_date, check_cycle, is_qc, is_safe_book, is_zone, zone_id,
     total_up_day, total_lease_day, origina_value, change_status, expiration_time, entry_status,
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml
index 4b31a02..ad16809 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml
@@ -39,12 +39,10 @@
                type_name,
                parent_id,
                storage_num,
-               company_id,
                code,
                unit_name,
                manage_type,
                eff_time,
-               rent_price,
                level,
                rated_load,
                test_load,
@@ -56,7 +54,6 @@
                update_by,
                update_time,
                is_plan,
-               is_ancuo,
                remark,
                intelligent_code,
                maintenance_alarm_day,