From c60eea0ab4d74ab8f39a33f896e978dc591f1800 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 12:11:47 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
index 67a7824..7c321e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.community.screen.event;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
@Data
@ApiModel("大屏事件播报流转记录返回参数")
@@ -24,22 +25,22 @@
@ApiModelProperty("事件处理人")
private String fromName;
- @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）",hidden = true)
+ @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）", hidden = true)
private Integer fromType;
- @ApiModelProperty(value = "事件来源机构或网格员",hidden = true)
+ @ApiModelProperty(value = "事件来源机构或网格员", hidden = true)
private Long fromId;
@ApiModelProperty("上级关系")
private String superiorRelationship;
- @ApiModelProperty(value = "事件id",hidden = true)
+ @ApiModelProperty(value = "事件id", hidden = true)
private Long eventId;
/**
* 来源类型（1、网格员2、社区3、是街道）
*/
- public interface fromType{
+ public interface fromType {
int wgy = 1;
int sq = 2;
int jd = 3;
--
Gitblit v1.7.1