From ba4af275c3b8d073f863be7b12e43974b3ef14a2 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期六, 12 七月 2025 10:27:06 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after into pim_ly --- 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