From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java
index acc2250..da46114 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java
@@ -1,15 +1,16 @@
 package com.panzhihua.common.model.dtos.community;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
- *  退役军人DTO
+ * 退役军人DTO
  */
 @Data
 @ApiModel("退役军人")
@@ -19,13 +20,13 @@
     /**
      * 分页-当前页数
      */
-    @ApiModelProperty(value = "分页-当前页数",example = "1")
+    @ApiModelProperty(value = "分页-当前页数", example = "1")
     private Long pageNum;
 
     /**
      * 分页-每页记录数
      */
-    @ApiModelProperty(value = "分页-每页记录数",example = "10")
+    @ApiModelProperty(value = "分页-每页记录数", example = "10")
     private Long pageSize;
 
     /**
@@ -37,7 +38,7 @@
     /**
      * 年龄开始时间查询字段
      */
-    @ApiModelProperty(value = "年龄开始时间查询字段",hidden = true)
+    @ApiModelProperty(value = "年龄开始时间查询字段", hidden = true)
     private String ageStartTime;
     /**
      * 年龄结束查询字段
@@ -48,7 +49,7 @@
     /**
      * 年龄结束时间查询字段
      */
-    @ApiModelProperty(value = "年龄结束时间查询字段",hidden = true)
+    @ApiModelProperty(value = "年龄结束时间查询字段", hidden = true)
     private String ageEndTime;
 
     /**
@@ -60,51 +61,51 @@
     /**
      * 主键id
      */
-    @ApiModelProperty(value="主键id")
+    @ApiModelProperty(value = "主键id")
     private Long id;
 
     /**
      * 街道id
      */
-    @ApiModelProperty(value="街道id",hidden = true)
+    @ApiModelProperty(value = "街道id", hidden = true)
     private Integer streetId;
 
     /**
      * 社区id
      */
-    @ApiModelProperty(value="社区id",hidden = true)
+    @ApiModelProperty(value = "社区id", hidden = true)
     private Long CommunityId;
     /**
      * 姓名
      */
-    @ApiModelProperty(value="姓名")
+    @ApiModelProperty(value = "姓名")
     private String name;
     /**
      * 性别
      */
-    @ApiModelProperty(value="性别")
+    @ApiModelProperty(value = "性别")
     private String sex;
 
     /**
      * 身份证号码
      */
-    @ApiModelProperty(value="身份证号码")
+    @ApiModelProperty(value = "身份证号码")
     @EncryptQuery
     private String cardNo;
     /**
      * 联系电话
      */
-    @ApiModelProperty(value="联系电话")
+    @ApiModelProperty(value = "联系电话")
     private String phone;
     /**
      * 创建时间
      */
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date createAt;
     /**
      * 修改时间
      */
-    @ApiModelProperty(value="修改时间")
+    @ApiModelProperty(value = "修改时间")
     private Date updateAt;
 
 }

--
Gitblit v1.7.1