From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化

---
 src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 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..4feacd3 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -37,6 +37,19 @@
     private String deviceModel;
 
     /**
+     * 璁惧鍝佺墝
+     */
+    @ApiModelProperty("璁惧鍝佺墝")
+    private String deviceBrand;
+
+    /**
+     * 瀛樻斁浣嶇疆
+     */
+    @ApiModelProperty("瀛樻斁浣嶇疆")
+    private String storageLocation;
+
+
+    /**
      * 渚涘簲鍟嗗悕绉�
      */
     private String supplierName;
@@ -122,4 +135,23 @@
 
     @ApiModelProperty("杩愯鏃堕暱")
     private String runtimeDuration;
+
+
+    @ApiModelProperty("鏄惁鎶樻棫 1-鏄� 2-鍚�")
+    private Integer isDepr;
+
+    @ApiModelProperty("姣忓勾鎶樻棫閲戦")
+    private BigDecimal annualDepreciationAmount;
+
+    @ApiModelProperty("璁惧绫诲瀷")
+    private String type;
+
+    @ApiModelProperty("璁惧缂栧彿")
+    private String deviceCode;
+
+    @ApiModelProperty("杞暟(杞�/min)")
+    private BigDecimal rpm;
+
+    @ApiModelProperty("棰勬湡鐢ㄩ��")
+    private String expectedUse;
 }

--
Gitblit v1.9.3