From f2f94ec05dc2078a7b11212d02767bd90ca29b96 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Tue, 2 Dec 2025 19:35:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=B8=E7=A7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/appmana/mapper/xml/SurvMulchRecordMapper.xml  | 3 ++-
 .../system/applet/mapper/xml/SurvMulchRecordMapper.xml    | 3 ++-
 .../java/org/jeecg/common/entity/SurvMulchRecord.java     | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMulchRecordMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMulchRecordMapper.xml
index 32e297d..e69c186 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMulchRecordMapper.xml
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMulchRecordMapper.xml
@@ -17,6 +17,7 @@
         <result column="mulch_remain" property="mulchRemain"/>
         <result column="updated_time" property="updatedTime"/>
         <result column="station_code" property="stationCode"/>
+        <result column="STRAW_REMAIN" property="strawRemain"/>
         <association property="stationName" column="station_code" select="getStationName"/>
     </resultMap>
 
@@ -25,7 +26,7 @@
     </select>
 
     <sql id="baseSql">
-        ID,CROP_NAME,MULCH_REMAIN,MULCH_YEAR,SAMP_TIME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,STATION_CODE,M_PICS,M_NOTE
+        ID,CROP_NAME,MULCH_REMAIN,MULCH_YEAR,SAMP_TIME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,STATION_CODE,M_PICS,M_NOTE,STRAW_REMAIN
     </sql>
 
 <select id="pages" resultMap="baseResultMap">
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMulchRecordMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMulchRecordMapper.xml
index ef52550..551046d 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMulchRecordMapper.xml
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvMulchRecordMapper.xml
@@ -18,6 +18,7 @@
         <result column="mulch_remain" property="mulchRemain"/>
         <result column="updated_time" property="updatedTime"/>
         <result column="station_code" property="stationCode"/>
+        <result column="STRAW_REMAIN" property="strawRemain"/>
         <association property="stationName" column="station_code" select="getStationName"/>
     </resultMap>
 
@@ -26,7 +27,7 @@
     </select>
 
     <sql id="baseSql">
-        ID,CROP_NAME,MULCH_REMAIN,MULCH_YEAR,SAMP_TIME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,STATION_CODE,M_PICS,M_NOTE
+        ID,CROP_NAME,MULCH_REMAIN,MULCH_YEAR,SAMP_TIME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,STATION_CODE,M_PICS,M_NOTE,STRAW_REMAIN
     </sql>
 
     <select id="pages" resultMap="baseResultMap">
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvMulchRecord.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvMulchRecord.java
index c6179ca..98238cb 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvMulchRecord.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvMulchRecord.java
@@ -42,9 +42,13 @@ public class SurvMulchRecord implements Serializable {
     @ApiModelProperty(value = "作物")
     private String cropName;
 	/**地膜残留量(g/hm2)*/
-	@Excel(name = "地膜残留量(g/hm2)", width = 15)
-    @ApiModelProperty(value = "地膜残留量(g/hm2)")
+	@Excel(name = "地膜残留量(kg/hm2)", width = 15)
+    @ApiModelProperty(value = "地膜残留量(kg/hm2)")
     private String mulchRemain;
+    /**秸秆残留量(g/hm2)*/
+    @Excel(name = "秸秆残留量(kg/hm2)", width = 15)
+    @ApiModelProperty(value = "秸秆残留量(kg/hm2)")
+    private String strawRemain;
 	/**覆膜年份*/
 	@Excel(name = "覆膜年份", width = 15, format = "yyyy")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy")