From 27a3b60fdd102fac12999684ead75a3a412ed66d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 12 九月 2023 08:48:13 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java b/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
index 3ddeac5..e1380ba 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
@@ -2,11 +2,14 @@
 
 import java.util.Date;
 
+
 public class alarmmg {
   private Integer id;
   private String content;
   private Date timeon;
   private Date endTime;
+
+  private String timeons;
 
   public void setid(Integer id) {
     this.id = id;
@@ -40,4 +43,12 @@
     return endTime;
   }
 
+  public void settimeons(String timeons) {
+    this.timeons = timeons;
+  }
+
+  public String gettimeons() {
+    return timeons;
+  }
+
 }

--
Gitblit v1.8.0