From 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 16 六月 2024 13:45:39 +0800
Subject: [PATCH] 修改了权限的代码
---
zhang-content/src/main/java/com/ruoyi/domain/MarryUser.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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..07f151d 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;
@@ -21,17 +25,37 @@
public class MarryUser implements Serializable {
private static final long serialVersionUID = 1L;
- private String id;
- private Long myId;
+ private Long id;
+ @Excel(name = "濮撳悕")
private String name;
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+
+ @Excel(name = "鎬у埆")
+ private String sex;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "鐢熸棩", dateFormat = "yyyy-MM-dd")
private Date birthday;
- private String address;
- private String workAddress;
- private Integer marryStatus;
- private Integer sex;
+
+ @Excel(name = "姘戞棌")
private String nation;
+
+ @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