Merge branch 'test' into 'test_wangge_two'

罗元桥

2021-06-23 72f11c9e9edec3d2534112badf7a0ca48fa9da5a

 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;

}