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

puhanshu

2022-07-22 c969a25c0b8b96efe4223553499fbafe29d1b299

 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;