Temp commit on 2023-05-01 5:00

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Notice.java

@@ -45,17 +45,29 @@ public class Notice implements Serializable {
     private String content;
 
     /**
-     * 公告类型
+     * 公告类型Id
      */
     @TableField("type_id")
     private Long typeId;
 
+    /**
+     * 公告类型
+     */
+    @TableField(exist = false)
+    private NoticeType noticeType;
+
     /**
      * 发布者id
      */
     @TableField("sender_id")
     private Long senderId;
 
+    /**
+     * 发布者
+     */
+    @TableField(exist = false)
+    private User sender;
+
     /**
      * 创建时间
      */
@@ -104,12 +116,6 @@ public class Notice implements Serializable {
     @TableField("old")
     private Integer old;
 
-    /**
-     * 发布者
-     */
-    @TableField(exist = false)
-    private User sender;
-
     @TableField("deleted")
     @TableLogic
     private Integer deleted;