Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java

@@ -35,13 +35,13 @@
    //使用期限(天)    
    private String useEndDay;
    //生命周期 1：已使用 2：库存中 3：报废    
    private Integer lifeCycle;
    private Byte lifeCycle;
    //投用日期    
    private Timestamp useDate;
    //维修状态 1:维修中 2：已修好    
    private Integer repairStatus;
    private Byte repairStatus;
    //停用状态 1:停用 2.在用 3.维修 4.报废    
    private Integer stopStatus;
    private Byte stopStatus;
    //上次检查日期    
    private Timestamp previousCheckDate;
    //上次检测日期    
@@ -312,11 +312,11 @@
        this.useEndDay = useEndDay;
    }
    //生命周期 1：已使用 2：库存中 3：报废        
    public Integer getLifeCycle() {
    public Byte getLifeCycle() {
        return lifeCycle;
    }

    public void setLifeCycle(Integer lifeCycle) {
    public void setLifeCycle(Byte lifeCycle) {
        this.lifeCycle = lifeCycle;
    }
    //投用日期        
@@ -328,19 +328,19 @@
        this.useDate = useDate;
    }
    //维修状态 1:维修中 2：已修好        
    public Integer getRepairStatus() {
    public Byte getRepairStatus() {
        return repairStatus;
    }

    public void setRepairStatus(Integer repairStatus) {
    public void setRepairStatus(Byte repairStatus) {
        this.repairStatus = repairStatus;
    }
    //停用状态 1:停用 2.在用 3.维修 4.报废        
    public Integer getStopStatus() {
    public Byte getStopStatus() {
        return stopStatus;
    }

    public void setStopStatus(Integer stopStatus) {
    public void setStopStatus(Byte stopStatus) {
        this.stopStatus = stopStatus;
    }
    //上次检查日期