合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.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 @@
 * 设备设施详细信息(EquipmentInfo)表实体类
 *
 * @author xurui
 * @since 2022-07-20 09:19:29
 * @since 2022-08-03 10:55:54
 */
@SuppressWarnings("serial")
@TableName("equipment_info")
@@ -237,6 +237,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 Long leadingPersonDepartmentId;
        
@@ -427,6 +437,16 @@
    public void setStopSubmitPersonId(Long stopSubmitPersonId) {
        this.stopSubmitPersonId = stopSubmitPersonId;
    }
                //停用提交人名称
    private String stopSubmitPersonName;
        
    public String getStopSubmitPersonName() {
        return stopSubmitPersonName;
    }

    public void setStopSubmitPersonName(String stopSubmitPersonName) {
        this.stopSubmitPersonName = stopSubmitPersonName;
    }
                //停用提交日期
    private Timestamp stopSubmitDate;