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/EquipmentRepairDetail.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
index cb6781e..4b5ab94 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.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 @@
* 设备维修明细(EquipmentRepairDetail)表实体类
*
* @author xurui
- * @since 2022-07-19 15:10:57
+ * @since 2022-08-03 11:17:00
*/
@SuppressWarnings("serial")
@TableName("equipment_repair_detail")
@@ -57,6 +57,16 @@
public void setRepairPersonId(Long repairPersonId) {
this.repairPersonId = repairPersonId;
}
+ //维修负责人名称
+ private String repairPersonName;
+
+ public String getRepairPersonName() {
+ return repairPersonName;
+ }
+
+ public void setRepairPersonName(String repairPersonName) {
+ this.repairPersonName = repairPersonName;
+ }
//维修开始日期
private Timestamp repairStartDate;
@@ -87,6 +97,16 @@
public void setRepairPersonDepartmentId(Long repairPersonDepartmentId) {
this.repairPersonDepartmentId = repairPersonDepartmentId;
}
+ //维修负责人单位名称
+ private String repairPersonDepartmentName;
+
+ public String getRepairPersonDepartmentName() {
+ return repairPersonDepartmentName;
+ }
+
+ public void setRepairPersonDepartmentName(String repairPersonDepartmentName) {
+ this.repairPersonDepartmentName = repairPersonDepartmentName;
+ }
//维修情况
private String repairMemo;
--
Gitblit v1.9.2