Merge branch 'test' into test_elder_cedoo

CeDo

2021-06-10 d991833be7b894f1eaee62c5c09032a68a9a2f5f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
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 io.swagger.annotations.ApiModel;
@@ -18,6 +20,7 @@
 * */
@Data
@ApiModel("高龄老人库返回参数")
@EncryptDecryptClass
public class ComEldersAuthElderlyVO {

    @ApiModelProperty(value = "主键id")
@@ -28,6 +31,7 @@

    @ApiModelProperty(value = "身份证号码")
   @Sensitive(strategy = SensitiveStrategy.ID_CARD)
   @EncryptDecryptField
   private String idCard;

    @ApiModelProperty(value = "出生年月")