From 9a4b09e6a32b4510e1e9c4fb13d6cb90b896abe4 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 16 七月 2024 21:23:26 +0800
Subject: [PATCH] 修改分页查询
---
zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 6d7e308..8829bce 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")
@@ -69,7 +75,7 @@
* 瀹跺涵id
*/
@Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
- private String familyId;
+ private Long familyId;
private String url;
@@ -98,7 +104,7 @@
/**
* 璁板綍鏃堕棿
*/
- @Excel(name = "璁板綍鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date happenTime;
--
Gitblit v1.9.1