Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java

@@ -218,6 +218,8 @@
    @ApiModelProperty("等级是否查询全部（1.是 2.否）")
    private Integer levelIsAll;

    @ApiModelProperty("是否死亡人员 (1.是 2.否)")
    private Integer isDeath;
    public interface levelIsAll{
        int yes = 1;
        int no = 2;