From 26e9429512245f4b441b55c3ce59c21a5ebb570f Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 12:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/test_excel610' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java
index 87c392f..9a7b25b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java
@@ -23,18 +23,13 @@
@ApiModelProperty("每天完成")
private String everyDayNum;
- @ApiModelProperty("完成总数")
- private Integer totalCompleted;
-
- @ApiModelProperty("未完成总数")
- private Integer totalNoneCompleted;
+ @ApiModelProperty("总完成度")
+ private Integer totalCompletedPoint;
@ApiModelProperty("已完成")
- private List<PieElementVO> completetList;
+ private List<ActWorkCountVO> completetPoint;
@ApiModelProperty("未完成")
- private List<PieElementVO> noneList;
-
-
+ private List<ActWorkCountVO> nonePoint;
}
--
Gitblit v1.7.1