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

gongchunyi

3 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

 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;
}