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

zss

2 天以前 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe

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

@@ -41,6 +41,18 @@
    private String deviceModel;

    /**
     * 设备品牌
     */
    @ApiModelProperty("设备品牌")
    private String deviceBrand;

    /**
     * 存放位置
     */
    @ApiModelProperty("存放位置")
    private String storageLocation;

    /**
     * 供应商名称
     */
    private String supplierName;