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

gongchunyi

5 天以前 70538f5464af062cd52628d468a17a8bb885e88f

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

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

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

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

    /**
     * 供应商名称
     */
    private String supplierName;
@@ -86,6 +74,10 @@
     */
    private BigDecimal unTaxIncludingPriceTotal;

    private String deviceBrand;

    private String storageLocation;

    /**
     * 录入时间
     */