From 7b5bd819a97e0c9f361e0f71c5c75329770a9291 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 12 一月 2025 20:55:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java | 10 ++++++++++
1 files changed, 10 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 bca3e8f..1d8cbaa 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
@@ -36,6 +36,12 @@
private String name;
/**
+ * 淇濅慨鏈熼檺
+ */
+ @Excel(name = "淇濅慨鏈熼檺")
+ private String baoXiu;
+
+ /**
* 鎻掑叆鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -102,6 +108,10 @@
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date happenTime;
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
}
--
Gitblit v1.9.1