From f1864f6d2d85b49fc901b22e9f6759a5d0fb360b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 26 十一月 2024 09:33:03 +0800 Subject: [PATCH] 开发更新 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 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 1d3b91e..399570e 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 @@ -61,8 +61,12 @@ @ApiModelProperty(value = "鍋ュ悍鐮�") private String imgurl; - @ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1") + @ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳 3瀹㈡埛鑱旂郴浜�", example = "1") private Integer type; + + @ApiModelProperty(value = "韬唤 0鑰佹澘/瓒呯骇绠$悊鍛� 1浜轰簨/绠$悊鍛� 2鍛樺伐/鏅�氬憳宸�", example = "1") + @ExcelColumn(name="韬唤 0鑰佹澘 1瓒呯骇绠$悊鍛� 2鍛樺伐") + private Integer highCheckor; @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳") @ExcelColumn(name="濮撳悕",index = 1,width = 8) @@ -126,9 +130,13 @@ private int memberCardCount; @ExcelColumn(name="宸ュ彿",index = 18,width = 8) private String code; - @ApiModelProperty(value = "璁垮骞撮緞") + @ApiModelProperty(value = "鐢熸棩") + @JsonFormat(pattern = "yyyy-MM-dd") private Date birthday; + + @ApiModelProperty(value = "瀹㈡埛缂栫爜锛堝叧鑱� YW_CUSTOMER )锛�", example = "1") + private Integer customerId; @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�") private String idcardNo; @@ -169,8 +177,6 @@ private String hkId; - - @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�") private Date hkDate; @@ -199,10 +205,6 @@ @ApiModelProperty(value = "鐧婚檰瀵嗙爜") private String passward; - - @ApiModelProperty(value = "鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�", example = "1") - private Integer highCheckor; - @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄evice_role),澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1") private String roleId; @@ -214,6 +216,11 @@ @ApiModelProperty(value = "璁垮鍏徃鍚嶇О") private String visitCompanyName; + + @ApiModelProperty(value = "閭") + @ExcelColumn(name="閭") + private String email; + @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉") @@ -299,4 +306,10 @@ @ApiModelProperty(value = "鏄惁鏌ヨ鍥哄畾浜哄憳锛�0=鍚︼紱1=鏄�" ) @TableField(exist = false) private Integer querySpecial; + + + @ApiModelProperty(value = "瀹㈡埛鍚嶇О", example = "1") + @TableField(exist = false) + private String customerName; + } -- Gitblit v1.9.3