From f0f08cc1ff84d45de32d8bff4a40e6a7d0d7a9e6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 10:45:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
index 5c772c4..94daa26 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
@@ -1,14 +1,15 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
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;
/**
@@ -62,8 +63,8 @@
@ExcelColumn(name="绠�浠�")
private String content;
- @ApiModelProperty(value = "鎿嶄綔绫诲瀷 0鍙戣捣鐢宠 1杞氦 2閫�鍥� 3鍙栨秷 4鏁存敼澶勭悊", example = "1")
- @ExcelColumn(name="鎿嶄綔绫诲瀷 0鍙戣捣鐢宠 1杞氦 2閫�鍥� 3鍙栨秷 4鏁存敼澶勭悊")
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷 0鍙戣捣鐢宠 1杞氦 2閫�鍥� 3鍙栨秷 4鏁存敼澶勭悊 5鍒犻櫎璁板綍", example = "1")
+ @ExcelColumn(name="鎿嶄綔绫诲瀷 0鍙戣捣鐢宠 1杞氦 2閫�鍥� 3鍙栨秷 4鏁存敼澶勭悊5鍒犻櫎璁板綍")
private Integer objType;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@@ -79,11 +80,14 @@
private String afterContent;
@ApiModelProperty(value = "鎿嶄綔浜�")
+ @TableField(exist = false)
private String createUserName;
@ApiModelProperty(value = "鎿嶄綔浜哄ご鍍�")
+ @TableField(exist = false)
private String avatar;
@ApiModelProperty(value = "鎿嶄綔缁勭粐淇℃伅")
+ @TableField(exist = false)
private String companyName;
}
--
Gitblit v1.9.3