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/BboreholeEntity.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/lf/server/entity/bd/BboreholeEntity.java b/src/main/java/com/lf/server/entity/bd/BboreholeEntity.java
index 05fc446..5cd8e02 100644
--- a/src/main/java/com/lf/server/entity/bd/BboreholeEntity.java
+++ b/src/main/java/com/lf/server/entity/bd/BboreholeEntity.java
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.time.LocalDate;
/**
* Bborehole
@@ -17,7 +18,7 @@
@TableName("bd.b_borehole")
@EqualsAndHashCode(callSuper = false)
public class BboreholeEntity extends BaseGeoEntity {
- private static final long serialVersionUID = 20666059581873036L;
+ private static final long serialVersionUID = 822473019744489856L;
private String drilltype;
@@ -29,7 +30,7 @@
private String holedepth;
- private String endholtime;
+ private LocalDate endholtime;
private String workspname;
@@ -63,7 +64,7 @@
private String adatano;
- private String pendtime;
+ private LocalDate pendtime;
private String workdegree;
@@ -138,11 +139,11 @@
this.holedepth = holedepth;
}
- public String getEndholtime() {
+ public LocalDate getEndholtime() {
return endholtime;
}
- public void setEndholtime(String endholtime) {
+ public void setEndholtime(LocalDate endholtime) {
this.endholtime = endholtime;
}
@@ -178,19 +179,19 @@
this.path = path;
}
- 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;
}
@@ -274,11 +275,11 @@
this.adatano = adatano;
}
- public String getPendtime() {
+ public LocalDate getPendtime() {
return pendtime;
}
- public void setPendtime(String pendtime) {
+ public void setPendtime(LocalDate pendtime) {
this.pendtime = pendtime;
}
--
Gitblit v1.9.3