From b34230301d2f6618e3f2af344b47ec3737d7007c Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期日, 16 三月 2025 14:30:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberTemplate.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberTemplate.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberTemplate.java
index 1cb779f..189b37d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberTemplate.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberTemplate.java
@@ -1,10 +1,7 @@
package com.panzhihua.sangeshenbian.model.excel;
import cn.idev.excel.annotation.ExcelProperty;
-import com.panzhihua.sangeshenbian.annotation.FastExcel;
-import com.panzhihua.sangeshenbian.conveter.EConverter;
-import com.panzhihua.sangeshenbian.enums.FreezeStatusEnum;
-import com.panzhihua.sangeshenbian.enums.GenderEnum;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -14,21 +11,27 @@
@Data
public class PartyMemberTemplate {
@ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","姓名"})
+ @ApiModelProperty(value = "姓名")
private String name;
@ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","联系电话"})
+ @ApiModelProperty(value = "联系电话")
private String phone;
@ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","身份证号"})
+ @ApiModelProperty(value = "身份证号")
private String idNumber;
@ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","所在社区"})
+ @ApiModelProperty(value = "所在社区")
private String community;
@ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","服务对象"})
+ @ApiModelProperty(value = "服务对象")
private String serviceTarget;
@ExcelProperty(value = {"说明：所在社区请按照规定格式填写：区县-街道-社区","所在党组织"})
+ @ApiModelProperty(value = "所在党组织")
private String partyOrganization;
}
--
Gitblit v1.7.1