From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 19 Aug 2022 19:04:02 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
index 38c557a..b67dbbc 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
@@ -533,5 +533,37 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
+
+ //区域ID/外键
+ private Long areaId;
+
+ //区域名称
+ private String areaName;
+
+ public Long getAreaId() {
+ return areaId;
+ }
+
+ public void setAreaId(Long areaId) {
+ this.areaId = areaId;
+ }
+
+ public String getAreaName() {
+ return areaName;
+ }
+
+ public void setAreaName(String areaName) {
+ this.areaName = areaName;
+ }
+
+ //保养周期
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2