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/model/dto/resp/EquipmentInfoDto.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
index ce9eb14..a0e2a3d 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
@@ -24,6 +24,8 @@
private String model;
//单位部门外键
private Long departmentId;
+ //单位部门名称
+ private String departmentName;
//设置部位
private String setPart;
//生产日期
@@ -54,6 +56,8 @@
private Long leadingPersonId;
//负责人部门外键
private Long leadingPersonDepartmentId;
+ //负责人部门名称
+ private String leadingPersonDepartmentName;
//供应商
private String supplyName;
//使用说明
@@ -76,6 +80,8 @@
private String checkContent;
//负责部门/外键
private Long leadingDepartmentId;
+ //负责部门名称
+ private String leadingDepartmentName;
//检查指标
private String checkPoint;
//预警值
@@ -579,4 +585,28 @@
public List<EquipmentCheckStandardDetail> getCheckStandardeDetailList() {
return checkStandardeDetailList;
}
+
+ public String getDepartmentName() {
+ return departmentName;
+ }
+
+ public void setDepartmentName(String departmentName) {
+ this.departmentName = departmentName;
+ }
+
+ public String getLeadingPersonDepartmentName() {
+ return leadingPersonDepartmentName;
+ }
+
+ public void setLeadingPersonDepartmentName(String leadingPersonDepartmentName) {
+ this.leadingPersonDepartmentName = leadingPersonDepartmentName;
+ }
+
+ public String getLeadingDepartmentName() {
+ return leadingDepartmentName;
+ }
+
+ public void setLeadingDepartmentName(String leadingDepartmentName) {
+ this.leadingDepartmentName = leadingDepartmentName;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2