From b9086588c215b7493682d65d49ed1070d88c3058 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:49:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' 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