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

云

3 天以前 6b362aaa220baaa6be5e957a89ace79eefde9f93

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

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

    private String deviceBrand;

    private String storageLocation;

    /**
     * 录入时间
     */