Merge branch 'master' into test

puhanshu

2021-12-24 afd27e98fd0d3df475289c56bd96595d81fa5b9b

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationAgeStatisticsVO.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("大屏首页实有人口年龄段数据统计返回参数")
public class IndexPopulationAgeStatisticsVO {
@@ -15,6 +17,6 @@
    private Integer sum = 0;

    @ApiModelProperty("占比")
    private Integer percent;
    private BigDecimal percent;

}