From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/rotation/entity/RotationEntity.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/rotation/entity/RotationEntity.java b/src/main/java/org/springblade/modules/rotation/entity/RotationEntity.java
index 74b4dd5..edd6dd5 100644
--- a/src/main/java/org/springblade/modules/rotation/entity/RotationEntity.java
+++ b/src/main/java/org/springblade/modules/rotation/entity/RotationEntity.java
@@ -59,10 +59,10 @@
 	@ApiModelProperty(value = "名称")
 	private String name;
 	/**
-	 * 类型
+	 * 类型 3：系统 1：公安 2：综治
 	 */
-	@ApiModelProperty(value = "类型")
-	private String type;
+	@ApiModelProperty(value = "类型 3：系统 1：公安 2：综治")
+	private Integer type;
 	/**
 	 * 内容
 	 */
@@ -80,6 +80,12 @@
 	private String junpUrl;
 
 	/**
+	 * 所属社区编号
+	 */
+	@ApiModelProperty(value = "所属社区编号")
+	private String communityCode;
+
+	/**
 	 * 创建人
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)

--
Gitblit v1.9.3