From 30e858fa504b268b9b436afca0a1259cf6e8c488 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 11:01:40 +0800
Subject: [PATCH] 优化
---
server/src/main/java/com/doumee/dao/business/model/Member.java | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/model/Member.java b/server/src/main/java/com/doumee/dao/business/model/Member.java
index 0be966e..ef23f5e 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Member.java
@@ -1,14 +1,13 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.doumee.core.annotation.excel.ExcelExportColumn;
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 lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -24,89 +23,68 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelExportColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelExportColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelExportColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelExportColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelExportColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelExportColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "濮撳悕")
- @ExcelExportColumn(name="濮撳悕")
private String name;
@ApiModelProperty(value = "澶囨敞")
- @ExcelExportColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤", example = "1")
- @ExcelExportColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelExportColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "澶村儚")
- @ExcelExportColumn(name="澶村儚")
private String imgurl;
@ApiModelProperty(value = "绫诲瀷", example = "1")
- @ExcelExportColumn(name="绫诲瀷")
private Integer type;
@ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮侊紙鍏宠仈company)", example = "1")
- @ExcelExportColumn(name="鎵�灞炵粍缁囩紪鐮侊紙鍏宠仈company)")
private String companyId;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelExportColumn(name="鎵嬫満鍙�")
private String phone;
@ApiModelProperty(value = "閭")
- @ExcelExportColumn(name="閭")
private String email;
@ApiModelProperty(value = "鎬у埆 0鐢� 1濂� 2浣嶇疆", example = "1")
- @ExcelExportColumn(name="鎬у埆 0鐢� 1濂� 2浣嶇疆")
private Integer sex;
@ApiModelProperty(value = "宸ュ彿")
- @ExcelExportColumn(name="宸ュ彿")
private String code;
@ApiModelProperty(value = "浼佸井鏍囪瘑")
- @ExcelExportColumn(name="浼佸井鏍囪瘑")
private String qwId;
@ApiModelProperty(value = "璇佷欢鍙�")
- @ExcelExportColumn(name="璇佷欢鍙�")
private String idcard;
@ApiModelProperty(value = "鏈�杩戜笂绾挎椂闂�")
- @ExcelExportColumn(name="鏈�杩戜笂绾挎椂闂�")
private Date lastLoginDate;
@ApiModelProperty(value = "鐧诲綍娆℃暟", example = "1")
- @ExcelExportColumn(name="鐧诲綍娆℃暟")
private Integer loginCount;
@ApiModelProperty(value = "鏄惁鍖呭惈涓嬬骇缁勭粐鐢ㄦ埛")
@@ -126,5 +104,14 @@
@ApiModelProperty(value = "鐢ㄦ埛鎵�灞炵粍缁囬泦鍚�")
@TableField(exist = false)
private List<Company> companyList;
+ @ApiModelProperty(value = "鐢ㄦ埛鎵�灞炵粍缁囧悕绉伴泦鍚�")
+ @TableField(exist = false)
+ private String[] companyNameList;
+ @ApiModelProperty(value = "鏄惁鏌ヨ鎶勯�佷汉锛�0=鍚︼紱1=鏄紱锛堟煡璇娇鐢級")
+ @TableField(exist = false)
+ private Integer isSendCopy;
+ @ApiModelProperty(value = "DCA鏉冮檺:0=鍚︼紱1=鏄�")
+ @TableField(exist = false)
+ private Integer dcaButton;
}
--
Gitblit v1.9.3