From 89f70f154bf778afb0d5b45455f1a0929aec4817 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 17 一月 2024 14:23:02 +0800
Subject: [PATCH] 更新合并

---
 springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 a9128ea..cde8841 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
@@ -1,14 +1,13 @@
 package com.example.springboot.entity;
 
 import java.util.Date;
-
+//鎶ヨ淇℃伅琛�
 public class alarmmg {
-  private Integer id;
-  private String content;
-  private Date timeon;
-  private Date endTime;
-
-  private String timeons;
+  private Integer id;//鑷id
+  private String content;//鎶ヨ鍐呭
+  private Date timeon;//鎶ヨ鏃堕棿
+  private Date endTime;//鎶ヨ缁撴潫鏃堕棿
+  private String timeons;//鎶ヨ鏃堕棿锛岄潪鏃堕棿鎴崇被鍨�
 
   // 鑷id
   public void setid(Integer id) {

--
Gitblit v1.8.0