Merge branch 'jtwy' into dev_New

zss

22 小时以前 be09cd5461ee9e2589ed833510ac6a2a52ded6f3

 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;