From 372822d209a560b017294b594906aa89bd46f4ce Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 11 七月 2025 09:02:41 +0800 Subject: [PATCH] 111 --- server/services/src/main/java/com/doumee/dao/business/model/Member.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Member.java b/server/services/src/main/java/com/doumee/dao/business/model/Member.java index a753400..6e5d6c4 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/Member.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/Member.java @@ -1,11 +1,14 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.dao.vo.UserCenterVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.models.auth.In; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; @@ -27,7 +30,7 @@ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1") @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�") - private Byte deleted; + private Integer deleted; @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1") @ExcelColumn(name="鍒涘缓浜虹紪鐮�") @@ -106,7 +109,7 @@ @ApiModelProperty(value = "鎬绘帴鍗曢噺", example = "1") @ExcelColumn(name="鎬绘帴鍗曢噺") - private Long reciveNum; + private Long receiveNum; @ApiModelProperty(value = "鎬诲彂鍗曢噺", example = "1") @ExcelColumn(name="鎬诲彂鍗曢噺") @@ -118,7 +121,7 @@ @ApiModelProperty(value = "瀹氫綅鍦板潃") @ExcelColumn(name="瀹氫綅鍦板潃") - private String localtion; + private String location; @ApiModelProperty(value = "绾害", example = "1") @ExcelColumn(name="绾害") @@ -142,6 +145,16 @@ @ApiModelProperty(value = "鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱", example = "1") @ExcelColumn(name="鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱") - private Integer autoReciveStatus; + private Integer autoReceiveStatus; + + + @ApiModelProperty(value = "褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;", example = "1") + @ExcelColumn(name="褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;") + private Integer useIdentity; + + @ApiModelProperty(value = "鎴戠殑 - 鏁版嵁淇℃伅", example = "1") + @TableField(exist = false) + private UserCenterVO userCenterVO; + } -- Gitblit v1.9.3