From 2c4cfb7ed1ece6c3b80f7d551a267e9367ddb12b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 05 一月 2024 10:31:31 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java index 2dd81ff..eef8155 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java +++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java @@ -79,7 +79,7 @@ @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳") private Integer type; - @ApiModelProperty(value = "璁垮鍚嶇О") + @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳") @ExcelColumn(name="璁垮鍚嶇О") private String name; @@ -188,9 +188,9 @@ @ExcelColumn(name="鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�") private Integer highCheckor; - @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄oor_role)", example = "1") - @ExcelColumn(name="闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄oor_role)") - private Integer roleId; + @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄evice_role),澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1") + @ExcelColumn(name="闂ㄧ瑙掕壊缂栫爜 ") + private String roleId; @ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿") @ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿") @@ -200,10 +200,38 @@ @ApiModelProperty(value = "ERP缁勭粐缂栫爜") @ExcelColumn(name="ERP缁勭粐缂栫爜") private String erpOrgId; + @ApiModelProperty(value = "缁勭粐鍚嶇О") @TableField(exist = false) private String companyName; @ApiModelProperty(value = "缁勭粐娴峰悍缂栫爜") @TableField(exist = false) private String companyHkId; + @ApiModelProperty(value = "瑙掕壊缂栫爜鏌ヨ") + @TableField(exist = false) + private String roleIdParam; + + @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑",hidden = true ) + @TableField(exist = false) + private Integer[] roleIds; + + //鏆傛棤浣跨敤 + @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 = "鏈�鍚庤闂椂闂�") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lastVisitDate; + + } -- Gitblit v1.9.3