From 31bb16817c3702b4515a05e010dffa8b490c83b6 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hysn' into hysn

---
 src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 26bdc91..bdc1fcd 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -71,6 +71,10 @@
      */
     private BigDecimal unTaxIncludingPriceTotal;
 
+    private String deviceBrand;
+
+    private String storageLocation;
+
     /**
      * 褰曞叆鏃堕棿
      */

--
Gitblit v1.9.3