From fe3996e9c4f4236d39f8ef468586c31a8a532d55 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sun, 23 Apr 2023 11:57:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java
index 2314601..32b423c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java
@@ -58,6 +58,6 @@
*/
@ApiModelProperty(value = "水库id")
@TableField("\"res_guid\"")
- private String res_guid;
+ private String resGuid;
}
--
Gitblit v1.9.3