Merge branch 'dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao

zouyu

2 天以前 0fcc6eb314fafab572def73100584d353089ee8c

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

@@ -76,6 +76,21 @@
    private BigDecimal unTaxIncludingPriceTotal;

    /**
     * 启用折旧
     */
    private Boolean enableDepreciation;

    /**
     * 存放位置
     */
    private String storageLocation;

    /**
     * 设备品牌
     */
    private String deviceBrand;

    /**
     * 录入时间
     */
    @TableField(fill = FieldFill.INSERT)