From 30a14783481d100a6503a56c902b47182e542c93 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期五, 08 十二月 2023 15:42:09 +0800 Subject: [PATCH] #组织树 和企业下的人员信息 人员卡信息 --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java index 214b280..86ee196 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java +++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.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; @@ -21,11 +22,11 @@ public class MemberCard { @TableId(type = IdType.AUTO) - @ApiModelProperty(value = "涓婚敭", example = "1") + @ApiModelProperty(value = "涓婚敭") @ExcelColumn(name="涓婚敭") private Integer id; - @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1") + @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�") @ExcelColumn(name="鍒涘缓浜虹紪鐮�") private Integer creator; @@ -34,7 +35,7 @@ @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; - @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") + @ApiModelProperty(value = "鏇存柊浜虹紪鐮�") @ExcelColumn(name="鏇存柊浜虹紪鐮�") private Integer editor; @@ -43,7 +44,7 @@ @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; - @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") + @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�") @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; @@ -51,9 +52,24 @@ @ExcelColumn(name="澶囨敞") private String remark; - @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)", example = "1") + @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)") @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)") private Integer memberId; + + @ApiModelProperty(value = "鐢ㄦ埛缂栫爜鍚嶇О") + @ExcelColumn(name="鐢ㄦ埛缂栫爜鍚嶇О") + @TableField(exist = false) + private String memberName; + + @ApiModelProperty(value = "鐢ㄦ埛鐢佃瘽") + @ExcelColumn(name="鐢ㄦ埛鐢佃瘽") + @TableField(exist = false) + private String memberPhone; + + @ApiModelProperty(value = "鍏徃缁勭粐鍚嶇О") + @ExcelColumn(name="鍏徃缁勭粐鍚嶇О") + @TableField(exist = false) + private String companyName; @ApiModelProperty(value = "鍗″彿") @ExcelColumn(name="鍗″彿") @@ -63,11 +79,11 @@ @ExcelColumn(name="鍗″瘑") private String passward; - @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1") + @ApiModelProperty(value = "娴峰悍鏍囪瘑") @ExcelColumn(name="娴峰悍鏍囪瘑") private String hkId; - @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1") + @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�") @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�") private Integer hkStatus; @@ -76,8 +92,12 @@ @JsonFormat(pattern = "yyyy-MM-dd") private Date hkDate; - @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1") + @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤") @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤") private Integer status; + + @ApiModelProperty(value = "鍏抽敭瀛�") + @TableField(exist = false) + private String KeyWords; } -- Gitblit v1.9.3