From b5da9c2985bd3e131f9b174fdf9ad2bbf7b30c6f Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 01 八月 2023 22:41:52 +0800
Subject: [PATCH] 25616
---
zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java b/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java
index c275941..8b003ce 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java
@@ -1,9 +1,13 @@
package com.ruoyi.domain;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.converter.BearStatusConverter;
import lombok.Data;
import java.io.PipedReader;
@@ -24,14 +28,38 @@
private String id;
private Long myId;
+ @Excel(name = "濮撳悕")
+// @ExcelProperty({"濮撳悕"})
private String name;
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "鐢熸棩", dateFormat = "yyyy-MM-dd")
+// @ExcelProperty({"鐢熸棩"})
+// @DateTimeFormat("yyyy-MM-dd")
private Date birthday;
+
+ @Excel(name = "鎴风睄鍦板潃")
+// @ExcelProperty({"鎴风睄鍦板潃"})
private String address;
- private String workAddress;
+
+ @Excel(name = "韬唤璇�")
+// @ExcelProperty({"宸ヤ綔鍦板潃"})
+ private String idNo;
+
+ @Excel(name = "濠氬Щ鐘跺喌",readConverterExp = "0=鏈,1=鍒濆,2=绂诲,3=鍐嶅")
+// @ExcelProperty(value = {"濠氬Щ鐘跺喌"},converter = BearStatusConverter.class)
private Integer marryStatus;
+
+ @Excel(name = "鎬у埆",readConverterExp = "0=濂�,1=鐢�")
+// @ExcelProperty({"鎬у埆"})
private Integer sex;
+
+ @Excel(name = "姘戞棌")
+// @ExcelProperty({"姘戞棌"})
private String nation;
+
+ @Excel(name = "鎵嬫満鍙风爜")
+// @ExcelProperty({"鎵嬫満鍙风爜"})
private String phone;
}
--
Gitblit v1.9.1