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/MequipmentnameplateEntity.java | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.java b/src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.java index e92dd86..94f5a2f 100644 --- a/src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.java +++ b/src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.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; /** * Mequipmentnameplate @@ -14,10 +15,10 @@ */ @Data @AllArgsConstructor -@TableName("bd.m_equipment_nameplate") +@TableName("bs.m_equipment_nameplate") @EqualsAndHashCode(callSuper = false) public class MequipmentnameplateEntity extends BaseGeoEntity { - private static final long serialVersionUID = 505455336303196480L; + private static final long serialVersionUID = 996290304696322560L; private String segname; @@ -33,7 +34,7 @@ private BigDecimal y; - private BigDecimal elev; + private BigDecimal elevation; private String belongs; @@ -46,6 +47,8 @@ private String version; private String datastage; + + private String photono; public MequipmentnameplateEntity() { } @@ -90,28 +93,28 @@ 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; } - 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() { @@ -161,4 +164,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