From 5323d2e4d07d5ceaaae6a5bf12254641a2d77174 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期二, 08 七月 2025 11:09:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java index 890d61f..f5d5463 100644 --- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java +++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java @@ -22,6 +22,11 @@ @ApiModelProperty("璁惧鍙拌处id") private Long deviceLedgerId; + + private String deviceName; + + private String deviceModel; + @ApiModelProperty("璁″垝淇濆吇鏃ユ湡") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") -- Gitblit v1.9.3