From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +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/ZfClean.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java
index 0e93e46..ed520e9 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java
@@ -31,36 +31,43 @@
/**
* 0锛氫繚娲侊紝1锛氭敹绾�
*/
+ @Excel(name = "绫诲瀷",readConverterExp = "0=淇濇磥,1=鏀剁撼")
private Integer kind;
/**
* 閫傜敤浜�
*/
+ @Excel(name = "閫傜敤浜�")
private String suitable;
/**
* 绫诲埆
*/
+ @Excel(name = "绫诲埆")
private String type;
/**
* 淇濇磥鏂规硶
*/
+ @Excel(name = "淇濇磥鏂规硶")
private String method;
/**
* 鏉愭枡瀛樻斁鍦�
*/
+ @Excel(name = "鏉愭枡瀛樻斁鍦�")
private String place;
/**
* 鏀剧疆鍦扮偣
*/
+ @Excel(name = "鏀剧疆鍦扮偣")
private String location;
/**
* 澶囨敞
*/
+ @Excel(name = "澶囨敞")
private String remark;
/**
@@ -69,7 +76,7 @@
private String url;
@Excel(name="鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
- private String familyId;
+ private Long familyId;
/**
@@ -99,7 +106,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