From 35a42eb3018f7caf4f3a4ec5f6b1b11dd95e55eb Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 1 Aug 2025 10:40:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/sgzb/app/domain/TmTask.java   | 7 -------
 .../src/main/resources/mapper/app/TmTaskMapper.xml        | 8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
index de1d1db..097dd23 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
@@ -365,13 +365,6 @@ public class TmTask implements Serializable {
     @ApiModelProperty(value = "领料id")
     private Integer leaseId;
 
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    @Excel(name = "备注", sort = 11)
-    private String remarkLease;
-
     public void setLeaseFee(BigDecimal leaseFee) {
         this.leaseFee = leaseFee;
     }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
index 590848e..2dbb052 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -1037,7 +1037,6 @@
       bui.unit_name AS unitName,
       lai.lease_person AS leasePerson,
       lai.phone AS leasePhone,
-      lai.remark AS remarkLease,
       tt.create_by AS applyFor,
       d.`name` AS taskName,
       lai.lease_type AS leaseType,
@@ -1099,7 +1098,8 @@
     lad.is_ct as isCt,
     lad.replace_type_id as replaceTypeId,
     lad.sets_num as setsNum,
-    lad.lease_price as leasePrice
+    lad.lease_price as leasePrice,
+    lad.remark as remark
     FROM
     lease_apply_details lad
     LEFT JOIN lease_apply_info lai on lad.parennt_id = lai.id
@@ -1144,7 +1144,8 @@
     lad.is_ct as isCt,
     lad.replace_type_id as replaceTypeId,
     lad.sets_num as setsNum,
-    lad.lease_price as leasePrice
+    lad.lease_price as leasePrice,
+    lad.remark as remark
     FROM
     lease_apply_details lad
     LEFT JOIN lease_apply_info lai on lad.parennt_id = lai.id
@@ -1340,7 +1341,6 @@
     bui.unit_name AS unitName,
     lai.lease_person AS leasePerson,
     lai.phone AS leasePhone,
-    lai.remark AS remarkLease,
     tt.create_by AS applyFor,
     d.`name` AS taskName,
     lai.lease_type AS leaseType,