From 97473ddec448bbc492b4d16aca08290db1b5b1ca Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 25 六月 2021 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 9a7b25b..c566b34 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,13 +23,16 @@
@ApiModelProperty("每天完成")
private String everyDayNum;
- @ApiModelProperty("总完成度")
- private Integer totalCompletedPoint;
+ @ApiModelProperty("完成总数")
+ private Integer totalCompleted;
+
+ @ApiModelProperty("未完成总数")
+ private Integer totalNoneCompleted;
@ApiModelProperty("已完成")
- private List<ActWorkCountVO> completetPoint;
+ private List<PieElementVO> completetList;
@ApiModelProperty("未完成")
- private List<ActWorkCountVO> nonePoint;
+ private List<PieElementVO> noneList;
}
--
Gitblit v1.7.1