From 1c8ed0e3e18d6ed97879cb2925db914a9d487314 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 17 六月 2021 14:47:03 +0800
Subject: [PATCH] Merge branch 'master' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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..f80c500 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,13 +18,13 @@
     @ApiModelProperty("本月新增")
     private Long currentNum;
 
-    @ApiModelProperty("已处理随手拍")
+    @ApiModelProperty("已处理")
     private List<EastPhotoTypeVO> deal;
 
-    @ApiModelProperty("已公示随手拍")
+    @ApiModelProperty("已公示")
     private List<EastPhotoTypeVO> pub;
 
-    @ApiModelProperty("已审核随手拍")
+    @ApiModelProperty("已驳回")
     private List<EastPhotoTypeVO> approved;
 
     @ApiModelProperty("未处理")
@@ -36,6 +36,8 @@
     @ApiModelProperty("平均耗时")
     private Integer dealTime;
 
+    @ApiModelProperty("线形图统计时间段")
+    private String listTimes;
 
     @ApiModelProperty("随手拍线形列表")
     private List<EastPhotoVO> list;

--
Gitblit v1.7.1