From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001 From: fei <791364011@qq.com> Date: 星期一, 06 十月 2025 08:39:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java index 1d8cbaa..29ec656 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java @@ -79,6 +79,8 @@ private String url; + private String fileName; + @Excel(name = "鏄惁娉ㄩ攢",readConverterExp = "0=姝e父,1=宸叉敞閿�") private Integer status; -- Gitblit v1.9.1