From 553831c82c2e8f8ff7b230c4d536cf99c47ece5b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 18:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/Company.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Company.java b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
index 67ac5cd..2a17391 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Company.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 浼佷笟淇℃伅琛�
@@ -31,7 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -50,6 +52,9 @@
@ApiModelProperty(value = "鍚嶇О")
@ExcelColumn(name="鍚嶇О")
private String name;
+ @ApiModelProperty(value = "娉曚汉濮撳悕")
+ @ExcelColumn(name="娉曚汉濮撳悕")
+ private String legalName;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
@@ -106,14 +111,45 @@
@ApiModelProperty(value = "浼佷笟閭")
@ExcelColumn(name="浼佷笟閭")
private String email;
+ @ApiModelProperty(value = "浼佷笟鐢靛瓙绔犵紪鐮�")
+ @ExcelColumn(name="浼佷笟鐢靛瓙绔犵紪鐮�")
+ private String signId;
+ @ApiModelProperty(value = "浼佷笟鐢靛瓙绔犵姸鎬� 0鏈笂浼� 1宸蹭笂浼� 2涓婁紶澶辫触")
+ @ExcelColumn(name="浼佷笟鐢靛瓙绔犵姸鎬�")
+ private Integer signIdStatus;
- @ApiModelProperty(value = "浼佷笟鐢靛瓙绛捐璇佺姸鎬� 0寰呰璇� 1宸茶璇� 2璁よ瘉澶辫触", example = "1")
- @ExcelColumn(name="浼佷笟鐢靛瓙绛捐璇佺姸鎬� 0寰呰璇� 1宸茶璇� 2璁よ瘉澶辫触")
+ @ApiModelProperty(value = "浼佷笟鐢靛瓙绛捐璇佺姸鎬� 0寰呰璇� 1璁よ瘉涓� 2璁よ瘉澶辫触 3璁よ瘉閫氳繃", example = "1")
+ @ExcelColumn(name="浼佷笟鐢靛瓙绛捐璇佺姸鎬� 0寰呰璇� 1璁よ瘉涓� 2璁よ瘉澶辫触 3璁よ瘉閫氳繃")
private Integer signStatus;
@ApiModelProperty(value = "鐢靛瓙绛捐璇佹椂闂�")
@ExcelColumn(name="鐢靛瓙绛捐璇佹椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date signDate;
+ @ApiModelProperty(value = "鏌ヨ杈ㄨ瘑 0鏉冮檺鑼冨洿鍐� 1鍏ㄩ儴")
+ @TableField(exist = false)
+ private int queryFlag ;
+ @ApiModelProperty(value = "鏄惁鎷ユ湁鏉冮檺 0鏃� 1鏈�")
+ @TableField(exist = false)
+ private int hasPerimission ;
+
+ @ApiModelProperty(value = "鏂规闆嗗悎" )
+ @TableField(exist = false)
+ private List<CompanySolution> solutionList;
+ @ApiModelProperty(value = "钀ヤ笟鎵х収" )
+ @TableField(exist = false)
+ private Multifile businessImg;
+ @ApiModelProperty(value = "娉曚汉韬唤璇佺収鐗�" )
+ @TableField(exist = false)
+ private List<Multifile> idcardImgList;
+ @ApiModelProperty(value = "浼佷笟绛剧珷鍥剧墖" )
+ @TableField(exist = false)
+ private Multifile signImg;
+
+ @ApiModelProperty(value = "楠岃瘉鐮�")
+ @TableField(exist = false)
+ private String captche;
+
+
}
--
Gitblit v1.9.3