From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
index 1d3aa11..10e5674 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
@@ -101,6 +101,12 @@
 	@ApiModelProperty(value = "部位")
 	@TableField(value = "\"part_place\"", fill = FieldFill.UPDATE)
 	private String partPlace;
+	/**
+	 * 部位
+	 */
+	@ApiModelProperty(value = "部位描述")
+	@TableField(value = "\"part_place_info\"", fill = FieldFill.UPDATE)
+	private String partPlaceInfo;
 
 	/**
 	 * 普查面积
@@ -124,9 +130,9 @@
 	private String investigationWay;
 
 	/**
-	 * 危害等级
+	 * 危害情况
 	 */
-	@ApiModelProperty(value = "危害等级")
+	@ApiModelProperty(value = "危害情况")
 	@TableField(value = "\"hazard_rating\"", fill = FieldFill.UPDATE)
 	private String hazardRating;
 

--
Gitblit v1.9.3