From aa9d5899deda2c9a9c4da111e89509136f1c4ec2 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 18 六月 2021 14:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java
index 11079a5..2c38b96 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java
@@ -18,14 +18,14 @@
@ApiModelProperty("本月新增")
private Long currentNum;
- @ApiModelProperty("已处理随手拍")
- private List<EastPhotoTypeVO> deal;
+ @ApiModelProperty("已处理")
+ private List<PieElementVO> deal;
- @ApiModelProperty("已公示随手拍")
- private List<EastPhotoTypeVO> pub;
+ @ApiModelProperty("已公示")
+ private List<PieElementVO> pub;
- @ApiModelProperty("已审核随手拍")
- private List<EastPhotoTypeVO> approved;
+ @ApiModelProperty("已驳回")
+ private List<PieElementVO> approved;
@ApiModelProperty("未处理")
private Long noneDeal;
@@ -34,8 +34,10 @@
private Integer pubPoint;
@ApiModelProperty("平均耗时")
- private Integer dealTime;
+ private String dealTime;
+ @ApiModelProperty("线形图统计时间段")
+ private String listTimes;
@ApiModelProperty("随手拍线形列表")
private List<EastPhotoVO> list;
--
Gitblit v1.7.1