From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 14 十月 2025 16:34:22 +0800 Subject: [PATCH] 改bug --- server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 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..a697a59 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 @@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; -import com.doumee.core.model.LoginUserInfo; +import com.doumee.service.business.third.model.LoginUserModel; import com.doumee.core.utils.Constants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; /** @@ -21,7 +21,7 @@ @Data @ApiModel("绯荤粺娑堟伅淇℃伅琛�") @TableName("`notices`") -public class Notices { +public class Notices extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -58,7 +58,7 @@ @ExcelColumn(name="鏍囬") private String title; - @ApiModelProperty(value = "绠�浠�") + @ApiModelProperty(value = "绠�浠�",notes = "灞曠ず鐘舵�佹弿杩� 鏍规嵁param2 璁剧疆") @ExcelColumn(name="绠�浠�") private String info; @@ -78,28 +78,27 @@ @ExcelColumn(name="鍏宠仈瀵硅薄鍚嶇О") private String objName; - @ApiModelProperty(value = "绫诲瀷") - @ExcelColumn(name="绫诲瀷") + @ApiModelProperty(value = "绫诲瀷 0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺 6鍏ュ洯鍘熷洜 7娴峰悍鑰冨嫟浠e姙") + @ExcelColumn(name="绫诲瀷 0璁垮瀹℃壒 1璁垮鎶ュ 2鐢ㄨ溅瀹℃壒 3闅愭偅澶勭悊 4鐗╂祦杞﹀鎵� 5绯荤粺绯荤粺 6鍏ュ洯鍘熷洜 7娴峰悍鑰冨嫟浠e姙") private Integer type; @ApiModelProperty(value = "绫诲瀷鎻忚堪") @TableField(exist = false) private String typeDetail; - - @ApiModelProperty(value = "鍏宠仈鍙傛暟1") + @ApiModelProperty(value = "瀛樺偍 娑堟伅灞曠ずJSON" ,notes = "瀛樺偍 娑堟伅灞曠ずJSON ") @ExcelColumn(name="鍏宠仈鍙傛暟1") private String param1; - @ApiModelProperty(value = "鍏宠仈鍙傛暟2") + @ApiModelProperty(value = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0=寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�",notes = "鐢ㄤ簬瀛樺偍 涓氬姟鐘舵�佷俊鎭� 0 =寰呭鐞�;1=宸插悓鎰�/宸插鐞�;2=宸叉嫆缁�/宸查��鍥�;3=宸茶浆浜�;4=宸叉挙閿�") @ExcelColumn(name="鍏宠仈鍙傛暟2") private String param2; - @ApiModelProperty(value = "鍏宠仈鍙傛暟3") + @ApiModelProperty(value = "鍙戣捣浜�",notes = "鍙戣捣浜�") @ExcelColumn(name="鍏宠仈鍙傛暟3") private String param3; - @ApiModelProperty(value = "鍏宠仈鍙傛暟4") + @ApiModelProperty(value = "鎿嶄綔浜�") @ExcelColumn(name="鍏宠仈鍙傛暟4") private String param4; @@ -127,6 +126,10 @@ @ExcelColumn(name="鐘舵�� 0姝e父 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; @@ -140,7 +143,7 @@ /** * - * @param noticeType 娑堟伅绫诲瀷 + * @param noticeObjectType 娑堟伅绫诲瀷 * @param palt 鏁版嵁骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅 * @param objId 鍏宠仈瀵硅薄涓婚敭 * @param content -- Gitblit v1.9.3