From 1c093829c5e7f58a04a34a831aace4b21a835250 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 07 八月 2023 23:15:07 +0800
Subject: [PATCH] 15487
---
zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 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 8b003ce..07f151d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java
@@ -25,41 +25,37 @@
public class MarryUser implements Serializable {
private static final long serialVersionUID = 1L;
- private String id;
- private Long myId;
+ private Long id;
- @Excel(name = "濮撳悕")
-// @ExcelProperty({"濮撳悕"})
+ @Excel(name = "濮撳悕")
private String name;
+
+ @Excel(name = "鎬у埆")
+ private String sex;
@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;
-
- @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({"姘戞棌"})
+ @Excel(name = "姘戞棌")
private String nation;
- @Excel(name = "鎵嬫満鍙风爜")
-// @ExcelProperty({"鎵嬫満鍙风爜"})
+ @Excel(name = "韬唤璇�")
+ private String idNo;
+
+ @Excel(name = "鎴风睄鍦板潃")
+ private String address;
+
+ @Excel(name = "鎵嬫満鍙风爜")
private String phone;
+ @Excel(name = "濠氬Щ鐘跺喌",readConverterExp = "0=鏈,1=鍒濆,2=绂诲,3=鍐嶅")
+ private Integer marryStatus;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "缁撳鏃堕棿", dateFormat = "yyyy-MM-dd")
+ private Date marryTime;
+
+ private Long uid;
+
}
--
Gitblit v1.9.1