From 79cd742d9b211c8705a6a7c6b1e71ff819403bcd Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 18 六月 2021 10:00:32 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 f80c500..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
@@ -19,13 +19,13 @@
private Long currentNum;
@ApiModelProperty("已处理")
- private List<EastPhotoTypeVO> deal;
+ private List<PieElementVO> deal;
@ApiModelProperty("已公示")
- private List<EastPhotoTypeVO> pub;
+ private List<PieElementVO> pub;
@ApiModelProperty("已驳回")
- private List<EastPhotoTypeVO> approved;
+ private List<PieElementVO> approved;
@ApiModelProperty("未处理")
private Long noneDeal;
@@ -34,7 +34,7 @@
private Integer pubPoint;
@ApiModelProperty("平均耗时")
- private Integer dealTime;
+ private String dealTime;
@ApiModelProperty("线形图统计时间段")
private String listTimes;
--
Gitblit v1.7.1