From 2c743103cfa6e24bcb3fd064845c8cfd8fe8bbe6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 14:02:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/entity/AlarmInfo.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/AlarmInfo.java b/screen-api/src/main/java/com/moral/api/entity/AlarmInfo.java
index bc3a6bd..b57b8d0 100644
--- a/screen-api/src/main/java/com/moral/api/entity/AlarmInfo.java
+++ b/screen-api/src/main/java/com/moral/api/entity/AlarmInfo.java
@@ -1,6 +1,7 @@
 package com.moral.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -38,6 +39,7 @@
     /**
      * ������������������
      */
+    @TableField("`index`")
     private String index;
 
     /**

--
Gitblit v1.8.0