Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-invent...

chenhj

17 小时以前 78331bf0082b9119a50ff7846986c896596b9782

Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材

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

@@ -145,4 +145,10 @@

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

    @ApiModelProperty("设备编号")
    private String deviceCode;

    @ApiModelProperty("转数(转/min)")
    private BigDecimal rpm;
}

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

@@ -159,4 +159,10 @@

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

    @ApiModelProperty("设备编号")
    private String deviceCode;

    @ApiModelProperty("转数(转/min)")
    private BigDecimal rpm;
}

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

@@ -31,7 +31,9 @@
        dl.tenant_id,
        dl.is_depr,
        dl.annual_depreciation_amount,
        dl.type
        dl.type,
        dl.device_code,
        dl.rpm
        FROM device_ledger dl
        left join sys_user su on dl.create_user = su.user_id
        <where>