From f6a1bf1d9b19dd8b3750034048f3876d086db1f1 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 14 八月 2024 17:11:49 +0800
Subject: [PATCH] 企业二维码添加

---
 project-system/src/main/java/com/project/system/domain/vo/SysCompanyVo.java |   68 +++++++++++++++++++++++++++------
 1 files changed, 55 insertions(+), 13 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 922687c..593de96 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,41 +25,79 @@
 	@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 = "浼佷笟鍦板潃")
 	@ApiModelProperty("浼佷笟鍦板潃")
 	private String companyAddress;
-	@Excel(name = "浼佷笟钀ヤ笟鎵х収鍥�")
+
 	@ApiModelProperty("浼佷笟钀ヤ笟鎵х収鍥�")
 	private String companyImg;
-	@Excel(name = "浼佷笟鐘舵�侊細0姝e父锛�1绂佺敤")
+
 	@ApiModelProperty("浼佷笟鐘舵�侊細0姝e父锛�1绂佺敤")
 	private Integer companyStatus;
-	@Excel(name = "鎵�灞炲尯鍩熺紪鐮�")
+
 	@ApiModelProperty("鎵�灞炲尯鍩熺紪鐮�")
 	private String regionCode;
-	@Excel(name = "鎵�灞炲尯鍩�")
+
 	@ApiModelProperty("鎵�灞炲尯鍩�")
 	private String regionName;
-	@Excel(name = "璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
+
 	@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
 	private Integer checkStatus;
-	@Excel(name = "鑷畾涔夋帓搴�")
+
+	@ApiModelProperty("浼佷笟绫诲瀷")
+	private String companyType;
+
+	@ApiModelProperty("浼佷笟鏉ユ簮锛�0娉ㄥ唽锛�1瀵煎叆")
+	private Integer isImport;
+
+	@ApiModelProperty("瀹℃壒璇存槑")
+	private String checkReason;
+
 	@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 String qrcodeImg;
+
+
+	@ApiModelProperty("閿欒淇℃伅鏁版嵁")
+	private List<ImportError> errorList;
+
 }

--
Gitblit v1.9.1