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

gongchunyi

2026-04-03 75ab3e422024b04730c2ce3b5014890d3e731fa8

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

@@ -12,7 +12,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * 设备台账实体类
@@ -75,6 +74,10 @@
     */
    private BigDecimal unTaxIncludingPriceTotal;

    private String deviceBrand;

    private String storageLocation;

    /**
     * 录入时间
     */