From 2079ba28f20bde46f7736699c97abf0e1564770d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 14 十月 2024 09:30:46 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 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 3516b64..a62910f 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 @@ -75,8 +75,8 @@ @ExcelColumn(name="鍋ュ悍鐮�") private String imgurl; - @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1") - @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳") + @ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1") + @ExcelColumn(name="绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳") private Integer type; @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳") @@ -104,6 +104,9 @@ @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1") @ExcelColumn(name="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収") private Integer idcardType; + @ApiModelProperty(value = "鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�", example = "1") + @ExcelColumn(name="鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�") + private Integer isDriver; @ApiModelProperty(value = "宸ュ彿") @ExcelColumn(name="宸ュ彿") @@ -215,7 +218,7 @@ @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉") @TableField(exist = false) private String editorName; - @ApiModelProperty(value = "缁勭粐绫诲瀷") + @ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐") @TableField(exist = false) private Integer companyType; @ApiModelProperty(value = "缁勭粐缂栫爜璺緞") @@ -233,11 +236,9 @@ @ApiModelProperty(value = "瑙掕壊缂栫爜鏌ヨ") @TableField(exist = false) private String roleIdParam; - @ApiModelProperty(value = "鍓嶇紑鍦板潃") @TableField(exist = false) private String prefixUrl; - @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑",hidden = true ) @TableField(exist = false) private Integer[] roleIds; @@ -247,37 +248,28 @@ @ApiModelProperty(value = "鏈夋晥鏈熺被鍨� 0闀挎湡鏈夋晥 1鑷畾涔�",hidden = true ) @TableField(exist = false) private Integer timeType; - //鏆傛棤浣跨敤 @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿") @TableField(exist = false) private String keyword; - - - @ApiModelProperty(value = "鏄惁鏈変汉鑴革細0=鏃狅紱1=鏈夛紱") @TableField(exist = false) private Integer isFace; - @ApiModelProperty(value = "璁块棶娆℃暟") @TableField(exist = false) private Integer visitTimes; - @ApiModelProperty(value = "鏈�鍚庤闂椂闂�") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lastVisitDate; - @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�") @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd") private Date startTime; @ApiModelProperty(value = "缂栫爜闆嗗悎") @TableField(exist = false) private List<Integer> idList; - @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1") @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd") private Date endTime; - @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃") @TableField(exist = false) private String faceImgFull; @@ -287,17 +279,22 @@ @ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1") @TableField(exist = false) private Integer headStatus; + @ApiModelProperty(value = "鎸佸崱鏁伴噺") + @TableField(exist = false) + private int memberCardCount; @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О") @TableField(exist = false) private String roleName; + @ApiModelProperty(value = "鏈�鍚庢搷浣滃唴瀹�") + @TableField(exist = false) + private String optRemark; @ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�") @TableField(exist = false) private Date trainStartTime; @ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿") @TableField(exist = false) private Date trainEndTime; - @ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�") @TableField(exist = false) private List<String> roleNames; -- Gitblit v1.9.3