From fb97f83e39a0995fb70326c492a0bcd37af5e300 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 12 十一月 2025 17:45:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java
index 9d1a523..adf492b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java
@@ -10,6 +10,7 @@
import java.io.Serializable;
import java.time.LocalDate;
+import java.time.LocalDateTime;
@Data
@ApiModel(value = "老人户籍信息导入excel")
@@ -23,8 +24,9 @@
@Excel(name = "老人年龄",width = 20)
private Integer oldsterAge;
- @ApiModelProperty(value = "性别 1=男 2=女")
+ @ApiModelProperty(value = "性别 男 女")
@Excel(name = "性别",width = 20)
+ private String oldsterSexStr;
private Integer oldsterSex;
@ApiModelProperty(value = "联系方式")
@@ -39,18 +41,20 @@
@Excel(name = "监护人电话",width = 20)
private String guardianPhone;
-
@ApiModelProperty(value = "身份证")
@Excel(name = "身份证",width = 40)
private String idCard;
@ApiModelProperty(value = "出生日期")
- @Excel(name = "出生日期",width = 20)
- private String birthDate;
+ @Excel(name = "出生日期[yyyy-mm-dd]",width = 20)
+ private String birthDateStr;
+ private LocalDate birthDate;
- @ApiModelProperty(value = "人员类型 1=独居老人 2=高龄老人 3=散居特困供养老人 4=失能老人")
- @Excel(name = "人员类型",width = 20)
- private String oldsterType;
+ @ApiModelProperty(value = "人员类型 独居老人 高龄老人 散居特困供养老人 失能老人")
+ @Excel(name = "人员类型 [独居老人|高龄老人|散居特困供养老人|失能老人]",width = 20)
+ private String oldsterTypeStr;
+
+ private Integer oldsterType;
@ApiModelProperty(value = "居住地址")
@Excel(name = "居住地址",width = 50)
--
Gitblit v1.7.1