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/CompanyDocuments.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java
index d810f29..d760754 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CompanyDocuments.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -17,7 +18,7 @@
* @date 2025/06/27 16:01
*/
@Data
-@ApiModel("闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛�")
+@ApiModel("璧勬枡绠＄悊淇℃伅琛�")
@TableName("`company_documents`")
public class CompanyDocuments extends LoginUserModel {
@@ -32,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -88,4 +87,16 @@
@ExcelColumn(name="闄勪欢鎻忚堪")
private String content;
+ @ApiModelProperty(value = "鍒嗙被鍚嶇О", example = "1")
+ @TableField(exist = false )
+ private String categoryName;
+ @ApiModelProperty(value = "璐ｄ换閮ㄩ棬", example = "1")
+ @TableField(exist = false )
+ private String companyName;
+ @ApiModelProperty(value = "璐ｄ换閮ㄩ棬缂栫爜(鍏宠仈company)", example = "1")
+ @TableField(exist = false )
+ private String fileurlFull;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�", example = "1")
+ @TableField(exist = false )
+ private String creatorName;
}
--
Gitblit v1.9.3