From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 14:18:58 +0800
Subject: [PATCH] 合并fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
index 458cd52..aa20823 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
-
+import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,7 +10,7 @@
* 设备保养明细(EquipmentTakecareDetail)表实体类
*
* @author xurui
- * @since 2022-07-19 14:40:28
+ * @since 2022-08-03 11:14:57
*/
@SuppressWarnings("serial")
@TableName("equipment_takecare_detail")
@@ -67,6 +67,16 @@
public void setLeadingPersonId(Long leadingPersonId) {
this.leadingPersonId = leadingPersonId;
}
+ //保养负责人名称
+ private String leadingPersonName;
+
+ public String getLeadingPersonName() {
+ return leadingPersonName;
+ }
+
+ public void setLeadingPersonName(String leadingPersonName) {
+ this.leadingPersonName = leadingPersonName;
+ }
//保养日期
private Timestamp takecareDate;
@@ -87,5 +97,15 @@
public void setLeadingPersonDepartmentId(Long leadingPersonDepartmentId) {
this.leadingPersonDepartmentId = leadingPersonDepartmentId;
}
+ //保养负责人单位名称
+ private String leadingPersonDepartmentName;
+
+ public String getLeadingPersonDepartmentName() {
+ return leadingPersonDepartmentName;
+ }
+
+ public void setLeadingPersonDepartmentName(String leadingPersonDepartmentName) {
+ this.leadingPersonDepartmentName = leadingPersonDepartmentName;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2