From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java b/src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java
index 7d54531..ef454d2 100644
--- a/src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java
+++ b/src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java
@@ -7,6 +7,7 @@
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 
 /**
  * Bgeologichazard
@@ -17,7 +18,7 @@
 @TableName("bd.b_geologic_hazard")
 @EqualsAndHashCode(callSuper = false)
 public class BgeologichazardEntity extends BaseGeoEntity {
-    private static final long serialVersionUID = 20666059581873036L;
+    private static final long serialVersionUID = 822473019744489856L;
 
     private String ghazid;
 
@@ -46,6 +47,8 @@
     private String datastatus;
 
     private String remarks;
+
+    private String name;
 
     public BgeologichazardEntity() {
     }
@@ -114,19 +117,19 @@
         this.pipename = pipename;
     }
 
-    public BigDecimal getx() {
+    public BigDecimal getX() {
         return x;
     }
 
-    public void setx(BigDecimal x) {
+    public void setX(BigDecimal x) {
         this.x = x;
     }
 
-    public BigDecimal gety() {
+    public BigDecimal getY() {
         return y;
     }
 
-    public void sety(BigDecimal y) {
+    public void setY(BigDecimal y) {
         this.y = y;
     }
 
@@ -161,4 +164,12 @@
     public void setRemarks(String remarks) {
         this.remarks = remarks;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }

--
Gitblit v1.9.3