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

liyong

21 小时以前 2cc19f8033348f34df382d27f63810b2d6f56a05

 src/main/java/com/ruoyi/device/pojo/DeviceLedger.java

@@ -142,4 +142,21 @@

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

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

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

    @TableField(exist = false)
    @ApiModelProperty("累计折旧")
    private BigDecimal deprAmount;

    @TableField(exist = false)
    @ApiModelProperty("净值")
    private BigDecimal netValue;

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