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

gongchunyi

5 天以前 70538f5464af062cd52628d468a17a8bb885e88f

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

@@ -71,6 +71,10 @@
     */
    private BigDecimal unTaxIncludingPriceTotal;

    private String deviceBrand;

    private String storageLocation;

    /**
     * 录入时间
     */