From 7c103250e5bf43bce97d7eea706ee7ccc59846ec Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期四, 24 六月 2021 16:40:43 +0800 Subject: [PATCH] Merge branch 'test_esay_photo' 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