Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

19 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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