From c148720d31eb2f8d68352e64eaddf17fd5b66a5a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:13:14 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-other/src/main/java/com/dsh/other/entity/Notice.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Notice.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Notice.java
index 55be75b..626f1e8 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Notice.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Notice.java
@@ -1,6 +1,7 @@
 package com.dsh.other.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -35,26 +36,32 @@
     /**
      * 功能名称
      */
+    @TableField("name")
     private String name;
     /**
      * 公告内容
      */
+    @TableField("content")
     private String content;
     /**
      * 排序
      */
+    @TableField("sort")
     private Integer sort;
     /**
      * 状态(1=正常,2=冻结,3=删除)
      */
+    @TableField("state")
     private Integer state;
     /**
      * 添加时间
      */
+    @TableField("insertTime")
     private Date insertTime;
     /**
      * 0下架1上架
      */
+    @TableField("upOrDown")
     private Integer upOrDown;
 
 

--
Gitblit v1.7.1