Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 49f8452f2df3a630cf62e0c03909fe6862c4fc98

 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;