From 72468556f3709380ab3a70e07d8a916fbd47c988 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 08:52:18 +0800
Subject: [PATCH] 添加字段,审批权限修改

---
 project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java b/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
index d54f2b8..c99e3a2 100644
--- a/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
+++ b/project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java
@@ -2,11 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.project.common.annotation.Excel;
+import com.project.common.core.domain.model.ImportError;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -23,20 +25,20 @@
 	@ApiModelProperty("浼佷笟id")
 	private Long companyId;
 
-	@Excel(name = "浼佷笟鍚�")
-	@ApiModelProperty("浼佷笟鍚�")
+	@Excel(name = "浼佷笟鍚�(浼佷笟鍏ㄧО)")
+	@ApiModelProperty("浼佷笟鍚�(浼佷笟鍏ㄧО)")
 	private String companyName;
 
-	@Excel(name = "浼佷笟绀句細缂栫爜")
-	@ApiModelProperty("浼佷笟绀句細缂栫爜")
+	@Excel(name = "缁熶竴绀句細淇$敤浠g爜")
+	@ApiModelProperty("缁熶竴绀句細淇$敤浠g爜")
 	private String companyCode;
 
 	@Excel(name = "浼佷笟鑱旂郴浜�")
 	@ApiModelProperty("浼佷笟鑱旂郴浜�")
 	private String companyUser;
 
-	@Excel(name = "浼佷笟鑱旂郴浜虹數璇�" , readConverterExp = "璐�=鍙�")
-	@ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+	@Excel(name = "鑱旂郴浜虹數璇�" )
+	@ApiModelProperty("鑱旂郴浜虹數璇�")
 	private String companyPhone;
 
 	@Excel(name = "浼佷笟鍦板潃")
@@ -67,12 +69,10 @@
 	@ApiModelProperty("瀹℃壒璇存槑")
 	private String checkReason;
 
-	@Excel(name = "鑷畾涔夋帓搴�")
 	@ApiModelProperty("鑷畾涔夋帓搴�")
 	private Integer sortNum;
 
 	/** 鍒涘缓浜� */
-	@Excel(name = "鍒涘缓浜�")
 	@ApiModelProperty("鍒涘缓浜�")
 	private String createBy;
 
@@ -81,16 +81,20 @@
 	private Date createTime;
 
 	/** 鏇存柊浜� */
-	@Excel(name = "鏇存柊浜�")
 	@ApiModelProperty("鏇存柊浜�")
 	private String updateBy;
 
-	@ApiModelProperty("鍒涘缓鏃堕棿")
+	@ApiModelProperty("鏇存柊鏃堕棿")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
+
 	/** 澶囨敞 */
 	@Excel(name = "澶囨敞")
 	@ApiModelProperty("澶囨敞")
 	private String remark;
 
+
+	@ApiModelProperty("閿欒淇℃伅鏁版嵁")
+	private List<ImportError> errorList;
+
 }

--
Gitblit v1.9.1