Merge branch 'test' into 'master'

罗元桥

2021-07-24 cbf825f4e63e77241a11ec90841637991e43940f

 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;

}