From 78331bf0082b9119a50ff7846986c896596b9782 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 25 三月 2026 13:51:27 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/device/pojo/DeviceLedger.java | 6 ++++++
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 6 ++++++
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 4 +++-
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 75d9250..167c62a 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -145,4 +145,10 @@
@ApiModelProperty("璁惧绫诲瀷")
private String type;
+
+ @ApiModelProperty("璁惧缂栧彿")
+ private String deviceCode;
+
+ @ApiModelProperty("杞暟(杞�/min)")
+ private BigDecimal rpm;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index f8c9e53..08324ff 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -159,4 +159,10 @@
@ApiModelProperty("璁惧绫诲瀷")
private String type;
+
+ @ApiModelProperty("璁惧缂栧彿")
+ private String deviceCode;
+
+ @ApiModelProperty("杞暟(杞�/min)")
+ private BigDecimal rpm;
}
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index c980120..3582a8c 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -31,7 +31,9 @@
dl.tenant_id,
dl.is_depr,
dl.annual_depreciation_amount,
- dl.type
+ dl.type,
+ dl.device_code,
+ dl.rpm
FROM device_ledger dl
left join sys_user su on dl.create_user = su.user_id
<where>
--
Gitblit v1.9.3