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

---
 src/main/java/org/springblade/modules/rotation/entity/RotationEntity.java |    6 +++---
 1 files changed, 3 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 bd2c520..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;
 	/**
-	 * 类型 1:系统  2:社区
+	 * 类型 3:系统 1:公安 2:综治
 	 */
-	@ApiModelProperty(value = "类型 1:系统  2:社区")
-	private String type;
+	@ApiModelProperty(value = "类型 3:系统 1:公安 2:综治")
+	private Integer type;
 	/**
 	 * 内容
 	 */

--
Gitblit v1.9.3