From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java
index f6ef95f..697ead8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java
+++ b/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;
}
--
Gitblit v1.7.1