Merge branch 'dev'

101captain

2022-03-14 85cf42314fc04a637f1a44e78c1e476a445bf0f3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java

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

import java.math.BigDecimal;
import java.util.List;

/**
@@ -20,9 +21,15 @@
    @ApiModelProperty(value = "正式党员人数")
    private Integer formalPartyMemberNum;

    @ApiModelProperty(value = "正式党员人数百分比")
    private BigDecimal formalPartyMemberNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "预备党员人数")
    private Integer preparePartyMemberNum;

    @ApiModelProperty(value = "预备党员人数百分比")
    private BigDecimal preparePartyMemberNumPercent = new BigDecimal(0);

    @ApiModelProperty(value = "体育类党员人数")
    private Integer tyNum;