From bc493033ebc2ab2bea86626f3cc66727cb993b7e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 03 Mar 2022 14:30:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/organ/entity/Organ.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/organ/entity/Organ.java b/src/main/java/org/springblade/modules/organ/entity/Organ.java
index 1320950..21b66f7 100644
--- a/src/main/java/org/springblade/modules/organ/entity/Organ.java
+++ b/src/main/java/org/springblade/modules/organ/entity/Organ.java
@@ -45,7 +45,7 @@
 	 * 用户id
 	 */
 	@ApiModelProperty(value = "用户id")
-	private Integer uid;
+	private String uid;
 	/**
 	 * 组织
 	 */
@@ -62,9 +62,6 @@
 	 * 进度
 	 */
 	@ApiModelProperty(value = "进度")
-	private Double
-
-		speed;
-
+	private String type;
 
 }

--
Gitblit v1.9.3