From 98250a7cff913563152ae8b313c7f45cc27545ba Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 27 二月 2025 09:13:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 07466d5..6ef1553 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -54,25 +54,25 @@
private String imgurl;
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅")
- @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 2, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
+ @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 5, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О")
- @ExcelColumn(name="濮撳悕" ,index = 3,width = 6)
+ @ExcelColumn(name="濮撳悕" ,index = 1,width = 6)
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�" ,index = 4,width = 12)
+ @ExcelColumn(name="鎵嬫満鍙�" ,index = 2,width = 12)
private String phone;
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- @ExcelColumn(name="韬唤璇佸彿" ,index = 5,width = 12)
+ @ExcelColumn(name="韬唤璇佸彿" ,index = 3,width = 12)
private String idcardDecode;
@ApiModelProperty(value = "宸ュ彿")
@@ -84,7 +84,7 @@
@ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
@ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12)
private String deviceName;
- @ApiModelProperty(value = "杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅 ")
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅 6鏈櫥璁拌溅杈� ")
private Integer carType ;
@ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
private String deviceIndex;
@@ -138,7 +138,7 @@
private String faceImgFull;
@ApiModelProperty(value = "瀵煎嚭鍏徃鍚嶇О",hidden = true)
- @ExcelColumn(name="鍏徃/缁勭粐" ,index = 1,width = 12)
+ @ExcelColumn(name="鍏徃/缁勭粐" ,index = 4,width = 12)
@TableField(exist = false)
public String excelCompanyName;
@@ -146,7 +146,6 @@
@ApiModelProperty(value = "浜烘暟")
@TableField(exist = false)
private Integer num;
-
@ApiModelProperty(value = "鏌ヨ浜哄憳绫诲瀷")
@TableField(exist = false)
--
Gitblit v1.9.3