From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/Building.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/Building.java b/igds-core/src/main/java/com/ld/igds/models/Building.java
index 61e0d46..5680532 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Building.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -2,6 +2,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -11,11 +12,9 @@
import java.util.Date;
/**
- * 寤虹瓚鐗╋紝鍖呮嫭浠撴埧鍜屽叾浠栨埧瀛�
- * <p>
- * 浠撳簱鐨勬晼闂翠娇鐢ㄧ殑鏄細Depot绫伙紝涓�涓粨鎴垮缓绛戝彲鑳藉寘鍚涓晼闂淬��
- * <p>
- * 褰撳墠瀹氫箟瀵硅薄浠呬粎鐢ㄤ簬寤虹瓚鐗╃殑鏁版嵁閰嶇疆
+ * @Desc: 鍩虹淇℃伅-浠撴埧淇℃伅
+ * @author: Andy
+ * @update-time: 2023/5/26
*/
@Data
@Entity
@@ -23,11 +22,11 @@
public class Building implements Serializable {
/**
- *
- */
- private static final long serialVersionUID = 1L;
+ *
+ */
+ private static final long serialVersionUID = 1L;
- @Id
+ @Id
@Column(name = "ID_", length = 50)
@PropertyDef(label = "浠撴埧缂栫爜")
private String id;
@@ -73,6 +72,10 @@
@PropertyDef(label = "绛掍粨浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
private Double volume;
+ @Column(name = "DE_VOLUME_", precision = 16, scale = 2)
+ @PropertyDef(label = "鎵ｉ櫎浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
+ private Double deVolume;
+
@Column(name = "DOOR_NUM_")
@PropertyDef(label = "浠撻棬鏁�")
private Integer doorNum;
@@ -96,12 +99,12 @@
@Column(name = "CREATE_DATE_")
@PropertyDef(label = "寤洪�犳棩鏈�")
private Date createDate;
-
- @Column(name = "LON_", precision = 16, scale = 4)
- @PropertyDef(label = "缁忓害")
- private Double lon;
- @Column(name = "LAT_", precision = 16, scale = 4)
- @PropertyDef(label = "绾害")
- private Double lat;
+ @Column(name = "LON_", precision = 16, scale = 4)
+ @PropertyDef(label = "缁忓害")
+ private Double lon;
+
+ @Column(name = "LAT_", precision = 16, scale = 4)
+ @PropertyDef(label = "绾害")
+ private Double lat;
}
--
Gitblit v1.9.3