合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.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 @@
 * 设备检测明细(EquipmentTestDetail)表实体类
 *
 * @author xurui
 * @since 2022-07-19 15:08:23
 * @since 2022-08-03 11:15:57
 */
@SuppressWarnings("serial")
@TableName("equipment_test_detail")
@@ -57,6 +57,16 @@
    public void setTestPersonId(Long testPersonId) {
        this.testPersonId = testPersonId;
    }
                //检测人名称
    private String testPersonName;
        
    public String getTestPersonName() {
        return testPersonName;
    }

    public void setTestPersonName(String testPersonName) {
        this.testPersonName = testPersonName;
    }
                //检测日期
    private Timestamp testDate;
        
@@ -77,6 +87,16 @@
    public void setTestPersonDepartmentId(Long testPersonDepartmentId) {
        this.testPersonDepartmentId = testPersonDepartmentId;
    }
                //检测人单位名称
    private String testPersonDepartmentName;
        
    public String getTestPersonDepartmentName() {
        return testPersonDepartmentName;
    }

    public void setTestPersonDepartmentName(String testPersonDepartmentName) {
        this.testPersonDepartmentName = testPersonDepartmentName;
    }
                //检测内容
    private String testMemo;