合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 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;
    }
}