Merge remote-tracking branch 'origin/master'

huanghongfa

2021-08-13 2e6ae80c0271e5e45faa399ce94cd44678cce43f

 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;

}