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/SboreholeEntity.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/lf/server/entity/bs/SboreholeEntity.java b/src/main/java/com/lf/server/entity/bs/SboreholeEntity.java
index ffe6166..04ff6fc 100644
--- a/src/main/java/com/lf/server/entity/bs/SboreholeEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/SboreholeEntity.java
@@ -1,4 +1,4 @@
-package com.lf.server.entity.bd;
+package com.lf.server.entity.bs;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.time.LocalDate;
/**
* Sborehole
@@ -14,10 +15,10 @@
*/
@Data
@AllArgsConstructor
-@TableName("bd.s_borehole")
+@TableName("bs.s_borehole")
@EqualsAndHashCode(callSuper = false)
public class SboreholeEntity extends BaseGeoEntity {
- private static final long serialVersionUID = 505455336303196480L;
+ private static final long serialVersionUID = 637485277670195968L;
private String drilltype;
@@ -39,7 +40,7 @@
private BigDecimal wamplitude;
- private String gwaterdate;
+ private LocalDate gwaterdate;
private String workname;
@@ -90,6 +91,8 @@
private String version;
private String datastage;
+
+ private String photono;
public SboreholeEntity() {
}
@@ -174,11 +177,11 @@
this.wamplitude = wamplitude;
}
- public String getGwaterdate() {
+ public LocalDate getGwaterdate() {
return gwaterdate;
}
- public void setGwaterdate(String gwaterdate) {
+ public void setGwaterdate(LocalDate gwaterdate) {
this.gwaterdate = gwaterdate;
}
@@ -318,19 +321,19 @@
this.projname = projname;
}
- 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;
}
@@ -381,4 +384,12 @@
public void setDatastage(String datastage) {
this.datastage = datastage;
}
+
+ public String getPhotono() {
+ return photono;
+ }
+
+ public void setPhotono(String photono) {
+ this.photono = photono;
+ }
}
--
Gitblit v1.9.3