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

gongchunyi

6 天以前 82402ef5ae74acd08815005cec52d9a959ddea06

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

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

    private String deviceBrand;

    private String storageLocation;

    /**
     * 录入时间
     */