Merge branch 'dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao

zouyu

昨天 0fcc6eb314fafab572def73100584d353089ee8c

Merge branch 'dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao

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

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

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

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

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

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

 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)

 src/main/resources/mapper/device/DeviceLedgerMapper.xml

@@ -26,6 +26,9 @@
        dl.update_time ,
        su.user_name AS createUser,
        dl.update_user,
        dl.device_brand,
        dl.enable_depreciation,
        dl.storage_location,
        dl.tenant_id
        FROM device_ledger dl
        left join sys_user su on dl.create_user = su.user_id