From 7e4cb4eeca9f5f9d6d0e38adaf0522f2473d767f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 01 十一月 2024 15:22:48 +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/Member.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 8d72649..42cbcad 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -133,7 +133,6 @@
@ExcelColumn(name="鍦ㄨ亴鐘舵��",index = 10,width = 12, valueMapping = "0=鍦ㄨ亴;1=绂昏亴;")
private Integer workStatus;
@ApiModelProperty(value = "鏄惁鍏氬憳 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍏氬憳",index = 6,width = 12,valueMapping = "1=鍚�;2=鏄�;")
private Integer isDangyuan;
@ApiModelProperty(value = "宀椾綅缂栫爜锛屽叧鑱攑ositionbiao", example = "1")
private Integer positionId;
@@ -188,7 +187,7 @@
@TableField(exist = false)
private String editorName;
@ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
- @ExcelColumn(name="閮ㄩ棬绫诲瀷",index = 9,width = 12, valueMapping = "0=鍔冲姟鍏徃;1=鍐呴儴缁勭粐;")
+ @ExcelColumn(name="閮ㄩ棬绫诲瀷",index = 9,width = 12, valueMapping = "0=鐩稿叧鏂圭粍缁�;1=鍐呴儴缁勭粐;")
@TableField(exist = false)
private Integer companyType;
@@ -270,6 +269,7 @@
@TableField(exist = false)
private Date trainStartTime;
@ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
+ @ExcelColumn(name="鍩硅鏈夋晥鏈�",index = 6,width = 12,dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date trainEndTime;
@ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
--
Gitblit v1.9.3