From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 2c38b96..11079a5 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<PieElementVO> deal;
+ @ApiModelProperty("已处理随手拍")
+ private List<EastPhotoTypeVO> deal;
- @ApiModelProperty("已公示")
- private List<PieElementVO> pub;
+ @ApiModelProperty("已公示随手拍")
+ private List<EastPhotoTypeVO> pub;
- @ApiModelProperty("已驳回")
- private List<PieElementVO> approved;
+ @ApiModelProperty("已审核随手拍")
+ private List<EastPhotoTypeVO> approved;
@ApiModelProperty("未处理")
private Long noneDeal;
@@ -34,10 +34,8 @@
private Integer pubPoint;
@ApiModelProperty("平均耗时")
- private String dealTime;
+ private Integer dealTime;
- @ApiModelProperty("线形图统计时间段")
- private String listTimes;
@ApiModelProperty("随手拍线形列表")
private List<EastPhotoVO> list;
--
Gitblit v1.7.1