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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,14 +1,15 @@
package com.panzhihua.common.model.vos.community.bigscreen;

import java.util.List;

import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @ClasssName BigScreenStatisticParty
 * @Description  大屏数据党建统计信息
 * @Description 大屏数据党建统计信息
 * @Author cedoo
 * @Date 2021/6/15
 * @Version 1.0
@@ -16,7 +17,7 @@
@Data
public class BigScreenStatisticPartyActivityTopUser {

   @ApiModelProperty(value = "党员活动排行榜")
   List<PartyBuildingMemberVO> topUser;
    @ApiModelProperty(value = "党员活动排行榜")
    List<PartyBuildingMemberVO> topUser;

}