Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java

@@ -7,6 +7,9 @@

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("服务统计返回")
public class ServiceStaticsVO {
@@ -20,5 +23,7 @@
    private List<ComActActivityVO> serviceActivityList;
    @ApiModelProperty("单位活动列表")
    private List<ComActActivityVO> workActivityList;
    @ApiModelProperty("服务明细列表")
    private List<ServiceDetailStaticsVO> serviceDetailStaticsList;
}