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/bs/MmarkerEntity.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/lf/server/entity/bs/MmarkerEntity.java b/src/main/java/com/lf/server/entity/bs/MmarkerEntity.java
index 9c2c3ca..36d8a0b 100644
--- a/src/main/java/com/lf/server/entity/bs/MmarkerEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MmarkerEntity.java
@@ -7,6 +7,7 @@
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 
 /**
  * Mmarker
@@ -17,7 +18,7 @@
 @TableName("bs.m_marker")
 @EqualsAndHashCode(callSuper = false)
 public class MmarkerEntity extends BaseGeoEntity {
-    private static final long serialVersionUID = 488103974837858240L;
+    private static final long serialVersionUID = 996290304696322560L;
 
     private String segname;
 
@@ -33,13 +34,13 @@
 
     private String photono;
 
-    private String meadate;
+    private LocalDate meadate;
 
     private BigDecimal x;
 
     private BigDecimal y;
 
-    private BigDecimal elev;
+    private BigDecimal elevation;
 
     private String belongs;
 
@@ -112,36 +113,36 @@
         this.photono = photono;
     }
 
-    public String getMeadate() {
+    public LocalDate getMeadate() {
         return meadate;
     }
 
-    public void setMeadate(String meadate) {
+    public void setMeadate(LocalDate meadate) {
         this.meadate = meadate;
     }
 
-    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;
     }
 
-    public BigDecimal getElev() {
-        return elev;
+    public BigDecimal getElevation() {
+        return elevation;
     }
 
-    public void setElev(BigDecimal elev) {
-        this.elev = elev;
+    public void setElevation(BigDecimal elevation) {
+        this.elevation = elevation;
     }
 
     public String getBelongs() {

--
Gitblit v1.9.3