From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
index 85e9332..2b76c44 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.LoginUserModel;
import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,7 +22,7 @@
@Data
@ApiModel("绯荤粺娑堟伅淇℃伅琛�")
@TableName("`notices`")
-public class Notices {
+public class Notices extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -58,7 +59,7 @@
@ExcelColumn(name="鏍囬")
private String title;
- @ApiModelProperty(value = "绠�浠�")
+ @ApiModelProperty(value = "绠�浠�",notes = "灞曠ず鐘舵�佹弿杩� 鏍规嵁param2 璁剧疆")
@ExcelColumn(name="绠�浠�")
private String info;
@@ -87,11 +88,11 @@
private String typeDetail;
- @ApiModelProperty(value = "鍏宠仈鍙傛暟1")
+ @ApiModelProperty(value = "鍏宠仈鍙傛暟1" ,notes = "瀛樺偍 娑堟伅灞曠ずJSON ")
@ExcelColumn(name="鍏宠仈鍙傛暟1")
private String param1;
- @ApiModelProperty(value = "鍏宠仈鍙傛暟2")
+ @ApiModelProperty(value = "鍏宠仈鍙傛暟2",notes = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0 =寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�")
@ExcelColumn(name="鍏宠仈鍙傛暟2")
private String param2;
@@ -127,6 +128,10 @@
@ExcelColumn(name="鐘舵�� 0姝ｅ父 1宸插叧闂� ")
private Integer status;
+ @ApiModelProperty(value = "鏄惁鎶勯�� 0涓嶆槸 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鎶勯�� 0涓嶆槸 1鏄�")
+ private Integer sendacopy;
+
@ApiModelProperty(value = "鏄惁宸茶 0鏈 1宸茶", example = "1")
@ExcelColumn(name="鏄惁宸茶 0鏈 1宸茶")
private Integer readed;
--
Gitblit v1.9.3