From 392366ea36a839e5d0ea05968e6da31cd53a9ee6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 八月 2025 14:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

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

diff --git a/main-business/src/main/java/com/ruoyi/business/dto/EquipmentUsageRecordDto.java b/main-business/src/main/java/com/ruoyi/business/dto/EquipmentUsageRecordDto.java
index 9710cd0..81dfc76 100644
--- a/main-business/src/main/java/com/ruoyi/business/dto/EquipmentUsageRecordDto.java
+++ b/main-business/src/main/java/com/ruoyi/business/dto/EquipmentUsageRecordDto.java
@@ -9,4 +9,8 @@
     private String equipmentNo; //璁惧缂栧彿
 
     private String equipmentName; //璁惧鍚嶇О
+
+    private String userName; //棰嗙敤浜�
+
+    private Integer totalReturnNo; //宸插綊杩樻�绘暟
 }

--
Gitblit v1.9.3