From f8c25d1fab78aa4e0a6bdb10f91e61698af434c4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Fri, 01 Jul 2022 14:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java
index 1074a5c..9992934 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java
@@ -4,5 +4,5 @@
private String name;
- private Byte
+ private Byte status;
}
--
Gitblit v1.9.2