From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期一, 29 九月 2025 11:29:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Warning.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Warning.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Warning.java index fb33896..1d79ddc 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Warning.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Warning.java @@ -1,6 +1,7 @@ package com.doumee.dao.business.model; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.service.business.third.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -18,7 +19,7 @@ @Data @ApiModel("鎶ヨ璁板綍淇℃伅琛�") @TableName("`warning`") -public class Warning { +public class Warning extends LoginUserModel { @ApiModelProperty(value = "涓婚敭", example = "1") @ExcelColumn(name="涓婚敭") @@ -99,4 +100,5 @@ @ExcelColumn(name="璁㈤槄鐢ㄦ埛(鍏宠仈member)") private Integer subscribeMemberId; + } -- Gitblit v1.9.3