Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

3 天以前 9a5d984a74d5f893fc51366b42391d9b4f8a83ed

 src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java

@@ -135,4 +135,14 @@

    @ApiModelProperty("运行时长")
    private String runtimeDuration;


    @ApiModelProperty("是否折旧 1-是 2-否")
    private Integer isDepr;

    @ApiModelProperty("每年折旧金额")
    private BigDecimal annualDepreciationAmount;

    @ApiModelProperty("设备类型")
    private String type;
}