Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-12 4c93d581de8323667e08bcb00dac88762a49e183

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

@@ -62,9 +62,11 @@
    @ApiModelProperty("身份证号码")
    @NotBlank(groups = {AddGroup.class},message = "身份证号码不可为空")
    @EncryptDecryptField
    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
    private String cardNo;

    @ApiModelProperty("出生年月")
    private String birthday;

    @ApiModelProperty("街路巷")
    @NotBlank(groups = {AddGroup.class},message = "街路巷不可为空")
    private String road;