From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
index 5cf29cc..5725919 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java
@@ -23,108 +23,97 @@
@TableName("`identity_info`")
public class IdentityInfo {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鐢宠鏃堕棿",index = 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "绫诲瀷:0=鐢ㄥ伐韬唤锛�1=璐ц繍韬唤锛�2=渚涢韬唤锛�", example = "1")
- @ExcelColumn(name="绫诲瀷:0=鐢ㄥ伐韬唤锛�1=璐ц繍韬唤锛�2=渚涢韬唤锛�")
+ @ExcelColumn(name="绫诲瀷",valueMapping = "0=鐢ㄥ伐韬唤;1=璐ц繍韬唤;2=渚涢韬唤;",index = 4,width = 10)
private Integer type;
@ApiModelProperty(value = "浼氬憳涓婚敭", example = "1")
- @ExcelColumn(name="浼氬憳涓婚敭")
private Integer memberId;
@ApiModelProperty(value = "璁よ瘉绫诲瀷:0=涓汉锛�1=浼佷笟", example = "1")
- @ExcelColumn(name="璁よ瘉绫诲瀷:0=涓汉锛�1=浼佷笟")
+ @ExcelColumn(name="璁よ瘉绫诲瀷",valueMapping = "0=涓汉;1=浼佷笟;",index = 5,width = 10)
private Integer authType;
@ApiModelProperty(value = "鑱旂郴浜�")
- @ExcelColumn(name="鑱旂郴浜�")
+ @ExcelColumn(name="鑱旂郴浜�",index = 6,width = 10)
private String linkName;
@ApiModelProperty(value = "鑱旂郴鏂瑰紡")
- @ExcelColumn(name="鑱旂郴鏂瑰紡")
+ @ExcelColumn(name="鑱旂郴鏂瑰紡",index = 7,width = 10)
private String telephone;
@ApiModelProperty(value = "鎺ュ崟浣嶇疆")
- @ExcelColumn(name="鎺ュ崟浣嶇疆")
+ @ExcelColumn(name="鎺ュ崟浣嶇疆",index = 8,width = 20)
private String location;
@ApiModelProperty(value = "鍗曚綅鍚嶇О")
- @ExcelColumn(name="鍗曚綅鍚嶇О")
+ @ExcelColumn(name="鍗曚綅鍚嶇О",index = 9,width = 10)
private String companyName;
@ApiModelProperty(value = "绾害", example = "1")
- @ExcelColumn(name="绾害")
private BigDecimal lat;
@ApiModelProperty(value = "缁忓害", example = "1")
- @ExcelColumn(name="缁忓害")
private BigDecimal lgt;
@ApiModelProperty(value = "韬唤璇佷汉鍍忛潰/钀ヤ笟鎵х収")
- @ExcelColumn(name="韬唤璇佷汉鍍忛潰/钀ヤ笟鎵х収")
private String img1;
@ApiModelProperty(value = "韬唤璇佸浗寰介潰/閬撹矾浜ら�氳惀杩愯鍙瘉/椋熷搧缁忚惀璁稿彲璇�")
- @ExcelColumn(name="韬唤璇佸浗寰介潰/閬撹矾浜ら�氳惀杩愯鍙瘉/椋熷搧缁忚惀璁稿彲璇�")
private String img2;
@ApiModelProperty(value = "浠庝笟浜哄憳鍋ュ悍璇�")
- @ExcelColumn(name="浠庝笟浜哄憳鍋ュ悍璇�")
private String img3;
@ApiModelProperty(value = "鍏朵粬璁よ瘉璧勬枡")
- @ExcelColumn(name="鍏朵粬璁よ瘉璧勬枡")
private String img4;
@ApiModelProperty(value = "璁よ瘉瀹℃壒鐘舵��:1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�", example = "1")
- @ExcelColumn(name="璁よ瘉瀹℃壒鐘舵��:1=鐢宠涓紱2=宸查�氳繃锛�3=鏈�氳繃锛�")
+ @ExcelColumn(name="瀹℃牳鐘舵��",valueMapping = "1=鐢宠涓�;2=宸查�氳繃;3=鏈�氳繃;",index = 1,width = 10)
private Integer auditStatus;
@ApiModelProperty(value = "璁よ瘉瀹℃壒鏃堕棿")
- @ExcelColumn(name="璁よ瘉瀹℃壒鏃堕棿")
+ @ExcelColumn(name="璁よ瘉瀹℃壒鏃堕棿",index = 12,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
private Date auditTime;
@ApiModelProperty(value = "璁よ瘉瀹℃壒澶囨敞")
- @ExcelColumn(name="璁よ瘉瀹℃壒澶囨敞")
+ @ExcelColumn(name="璁よ瘉瀹℃壒澶囨敞",index = 13,width = 16)
private String auditRemark;
- @ApiModelProperty(value = "鍥剧墖鍓嶇紑")
- @TableField(exist = false)
- private String prefix;
+
@ApiModelProperty(value = "瀹℃牳浜哄鍚�")
@TableField(exist = false)
+ @ExcelColumn(name="瀹℃牳浜哄鍚�",index = 11,width = 10)
private String editorName;
@ApiModelProperty(value = "鐢ㄦ埛openid")
+ @ExcelColumn(name="openid",index = 2,width = 20)
@TableField(exist = false)
private String openid;
@ApiModelProperty(value = "鐢ㄦ埛鏄电О")
+ @ExcelColumn(name="浼氬憳鏄电О",index = 3,width = 10)
@TableField(exist = false)
private String memberName;
@ApiModelProperty(value = "鍥剧墖闆嗗悎")
--
Gitblit v1.9.3