From a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 15:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
index 8f72337..3d1cd24 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -1,5 +1,9 @@
package com.panzhihua.common.model.vos.community;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -15,6 +19,7 @@
*/
@Data
@ApiModel("实有人口表")
+@EncryptDecryptClass
public class ComMngPopulationVO {
/**
@@ -60,6 +65,8 @@
*/
@ApiModelProperty("身份证号码")
@NotBlank(groups = {AddGroup.class},message = "身份证号码不可为空")
+ @EncryptDecryptField
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
private String cardNo;
/**
* 街路巷
@@ -111,6 +118,8 @@
*/
@ApiModelProperty("联系方式")
@NotBlank(groups = {AddGroup.class},message = "联系方式不可为空")
+ @EncryptDecryptField
+ @Sensitive(strategy = SensitiveStrategy.PHONE)
private String phone;
/**
* 备注
@@ -160,4 +169,32 @@
@ApiModelProperty("是否租住")
@NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
private Integer isRent;
+
+ /**
+ * 性别（1.男 2.女 3.未知）
+ */
+ public interface sex{
+ int nan = 1;
+ int nv = 2;
+ int no = 3;
+ }
+
+ /**
+ * 是否租住
+ */
+ public interface isOk{
+ int yes = 1;
+ int no = 0;
+ }
+
+ /**
+ * 政治面貌
+ */
+ public interface politicalOutlook{
+ int dang = 1;
+ int tuan = 3;
+ int wu = 12;
+ int qun = 13;
+ int no = 13;
+ }
}
--
Gitblit v1.7.1