Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-19 759bbb8ee99665382a689fa90277a9b2279238da

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java

@@ -148,6 +148,17 @@
    @ExcelCell(index = 47)
    private Timestamp actualDestoryDate;
        
    //保养周期
    @ExcelCell(index = 48)
    private String takecareCycle;

    public String getTakecareCycle() {
        return takecareCycle;
    }

    public void setTakecareCycle(String takecareCycle) {
        this.takecareCycle = takecareCycle;
    }

    //类型/类别外键
    public Long getEquipmentTypeId() {