Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-09 d079a68e22e9e11ad4af0b11e19d9398bd62f193

 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;