Merge remote-tracking branch 'origin/master'

mitao

6 天以前 0b7e2752b6f1e87084b837043291c890cca780a8

 ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java

@@ -33,11 +33,11 @@
    @ApiModelProperty(value = "事项标题")
    private String title;

    @ApiModelProperty(value = "维修资产类型")
    private String assetTypeName;
    @ApiModelProperty(value = "维修资产类型ID")
    private Integer assetTypeId;

    @ApiModelProperty(value = "维修资产一级类型")
    private String assetTypeFirstLevel;
    @ApiModelProperty(value = "资产类型")
    private String assetTypeName;

    @ApiModelProperty(value = "维修开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")