From 07f4cb2bb4e648dcf4e646cd56404be58505eb81 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 21 八月 2021 18:36:21 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
index 82a4a1e..8796d79 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -106,7 +106,7 @@
@ApiModelProperty(value = "是否需要反馈 1 是 0 不是",example = "0")
private Integer isNeedFeedBack;
- @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈 4.完成随手拍")
+ @ApiModelProperty("操作类型 1处理随手拍 2驳回 3反馈 4.完成随手拍")
private Integer type;
@ApiModelProperty(value = "登录用户id",hidden = true)
@@ -143,7 +143,7 @@
@ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
private String lngLat;
- @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般）")
+ @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般 5.无）")
private Integer activityType;
@ApiModelProperty(value = "参加活动奖励金额")
@@ -170,4 +170,34 @@
@ApiModelProperty(value = "完成人名称")
private String completeName;
+ @ApiModelProperty(value = "是否上报城管 0未上报 1已上报 2已退回")
+ private Integer isReportUrban;
+
+ @ApiModelProperty(value = "城管移交说明（备注）")
+ private String transferReason;
+
+ @ApiModelProperty("移交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date transferTime;
+
+ @ApiModelProperty(value = "城管安排状态 0未安排 1已安排 2已处理")
+ private Integer urbanStatus;
+
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+
+ @ApiModelProperty(value = "随手拍分类id")
+ private Long classifyId;
+
+ @ApiModelProperty(value = "随手拍分类名称")
+ private String classifyName;
+
+ /**
+ * 是否上报城管 0未上报 1已上报 2已退回
+ */
+ public interface isReportUrban{
+ int no = 0;
+ int yes = 1;
+ int ret = 2;
+ }
}
--
Gitblit v1.7.1