From 3ab667a5d35d025fcd73b0493b02e07d98c5679a Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 16 Aug 2023 12:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
index 5b84774..8e0e966 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResPowerStation.java
@@ -41,6 +41,13 @@
 	private String resGuid;
 
 	/**
+	 * 名称
+	 */
+	@ApiModelProperty(value = "名称")
+	@TableField("\"name\"")
+	private String name;
+
+	/**
 	 * 厂房布置型式
 	 */
 	@ApiModelProperty(value = "厂房布置型式")

--
Gitblit v1.9.3