From 0a0bbb964267bf53b35ae67dc946b7e5d1aaa8e8 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 28 一月 2026 16:26:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
index 4818c1c..dfd82ac 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
@@ -14,6 +14,8 @@
     private Integer id;
     @ApiModelProperty("项目名称")
     private String projectName;
+    @ApiModelProperty("委托方id")
+    private Integer clientId;
     @ApiModelProperty("设备类型:1-塔式起重机 2-施工升降机 3-物料提升机 4-桥式起重机 5-附着式升降脚手架 6-流动式起重机 7-高处作业吊篮 8-门式起重机 9-架桥机 10-其他")
     private Integer type;
     @ApiModelProperty("设备编号")

--
Gitblit v1.7.1