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

huanghongfa

2021-08-06 add39a5a140ca34752dc8f91a1b7f8f3b8185b72

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationListDTO.java

@@ -55,4 +55,7 @@
    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

    @ApiModelProperty(value = "身份证号码", hidden = true, example = "1")
    private String cardNo;

}