From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 20 十二月 2024 09:50:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java index 7146dfe..159b872 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.LoginUserModel; import com.doumee.dao.business.vo.ApproveDataVO; import io.swagger.annotations.ApiModel; @@ -244,7 +245,7 @@ // @ApiModelProperty(value = "鐝") // private String memberClasses; - @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1") + @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1") @TableField(exist = false) private Integer memberType; @ApiModelProperty(value = "鍔冲姟璁垮鐢宠闅忚浜哄憳") @@ -261,6 +262,11 @@ @ExcelColumn(name="琚浜哄憳濮撳悕") @TableField(exist = false) private String receptMemberName; + + @ApiModelProperty(value = "琚浜哄憳鐢佃瘽", example = "1") + @ExcelColumn(name="琚浜哄憳鐢佃瘽") + @TableField(exist = false) + private String receptMemberMobile; @ApiModelProperty(value = "琚浜哄憳娴峰悍缂栫爜", example = "1") @ExcelColumn(name="琚浜哄憳濮撳悕") @TableField(exist = false) @@ -306,6 +312,18 @@ @TableField(exist = false) private String createMemberName; + @ApiModelProperty(value = "鍒涘缓浜虹數璇�", example = "1") + @TableField(exist = false) + private String createMobile; + + @ApiModelProperty(value = "鍚庣鍒涘缓浜�", example = "1",hidden = true) + @TableField(exist = false) + private LoginUserInfo loginUserInfo; + + @ApiModelProperty(value = "閫氱煡鎻忚堪") + @TableField(exist = false) + private String info; + @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁") @TableField(exist = false) private ApproveDataVO approveDateVO; -- Gitblit v1.9.3