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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java

@@ -33,9 +33,6 @@
    @ApiModelProperty("退役军人")
    private Integer tyTotal = 0;

    @ApiModelProperty("退休人员")
    private Integer txTotal = 0;

    @ApiModelProperty(value = "吸毒人员",hidden = true)
    private Integer xdTotal = 0;