From ee22d914b0b400cbf35ba4d10346bf1a349d1d62 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 17:59:26 +0800
Subject: [PATCH] 生成模板优化
---
project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 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 48a7c0e..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
@@ -1,10 +1,14 @@
package com.project.system.domain.vo;
-import com.project.common.annotation.Excel;
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;
/**
@@ -21,20 +25,20 @@
@ApiModelProperty("浼佷笟id")
private Long companyId;
- @Excel(name = "浼佷笟鍚�")
- @ApiModelProperty("浼佷笟鍚�")
+ @Excel(name = "浼佷笟鍚�(浼佷笟鍏ㄧО)")
+ @ApiModelProperty("浼佷笟鍚�(浼佷笟鍏ㄧО)")
private String companyName;
- @Excel(name = "浼佷笟绀句細缂栫爜")
- @ApiModelProperty("浼佷笟绀句細缂栫爜")
+ @Excel(name = "缁熶竴绀句細淇＄敤浠ｇ爜")
+ @ApiModelProperty("缁熶竴绀句細淇＄敤浠ｇ爜")
private String companyCode;
@Excel(name = "浼佷笟鑱旂郴浜�")
@ApiModelProperty("浼佷笟鑱旂郴浜�")
private String companyUser;
- @Excel(name = "浼佷笟鑱旂郴浜虹數璇�" , readConverterExp = "璐�=鍙�")
- @ApiModelProperty("浼佷笟鑱旂郴浜虹數璇濓紙璐﹀彿锛�")
+ @Excel(name = "鑱旂郴浜虹數璇�" )
+ @ApiModelProperty("鑱旂郴浜虹數璇�")
private String companyPhone;
@Excel(name = "浼佷笟鍦板潃")
@@ -56,15 +60,41 @@
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
+ @ApiModelProperty("浼佷笟绫诲瀷")
+ private String companyType;
+
+ @ApiModelProperty("浼佷笟鏉ユ簮锛�0娉ㄥ唽锛�1瀵煎叆")
+ private Integer isImport;
+
@ApiModelProperty("瀹℃壒璇存槑")
private String checkReason;
- @Excel(name = "鑷畾涔夋帓搴�")
@ApiModelProperty("鑷畾涔夋帓搴�")
private Integer sortNum;
+ /** 鍒涘缓浜� */
+ @ApiModelProperty("鍒涘缓浜�")
+ private String createBy;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /** 鏇存柊浜� */
+ @ApiModelProperty("鏇存柊浜�")
+ private String updateBy;
+
+ @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