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

lidongdong

2022-09-23 1b6430587fcf72e58510a32f7e6c88bda565f62e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateAnalysisVO.java

@@ -12,7 +12,7 @@
    private String name;

    @ApiModelProperty("占比")
    private Double rate;
    private Integer rate;

    @ApiModelProperty("人数")
    private Integer count;