From b701cf0331e91900bf8055009a745d4953a6c510 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 17:58:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 604001d..bdc1fcd 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -37,19 +37,6 @@
private String deviceModel;
/**
- * 璁惧鍝佺墝
- */
- @ApiModelProperty("璁惧鍝佺墝")
- private String deviceBrand;
-
- /**
- * 瀛樻斁浣嶇疆
- */
- @ApiModelProperty("瀛樻斁浣嶇疆")
- private String storageLocation;
-
-
- /**
* 渚涘簲鍟嗗悕绉�
*/
private String supplierName;
@@ -84,6 +71,10 @@
*/
private BigDecimal unTaxIncludingPriceTotal;
+ private String deviceBrand;
+
+ private String storageLocation;
+
/**
* 褰曞叆鏃堕棿
*/
--
Gitblit v1.9.3