Merge branch 'master' into test

puhanshu

2021-12-24 6496d6a229ba8e0acd0777863fb34bee0f5ce717

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserveSub.java

@@ -18,8 +18,4 @@
    private Integer allCount;
    @ApiModelProperty("占比")
    private Integer percent;

    public Integer getPercent() {
        return  this.percent = num*100/allCount;
    }
}