From cc1b30616f0b395fb04c4e500a936a934b3d678b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 2 Sep 2021 11:47:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/entity/TbMemberProjectSubitem.java | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
index a78c9417..f99f4ab0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.common.util.PasswordUtil;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -56,17 +57,16 @@ public class TbMemberProjectSubitem implements Serializable {
     private java.util.Date updateTime;
 
 	/**项目id*/
-	@Excel(name = "项目id", width = 15)
+	@Excel(name = "项目名称", width = 15 ,dictTable = "tb_member_project", dicText = "project_name", dicCode = "id")
     @ApiModelProperty(value = "项目id")
     private String projectId;
 
 	/**会员编号*/
-	@Excel(name = "会员编号", width = 15)
+	@Excel(name = "会员编号", width = 20)
     @ApiModelProperty(value = "会员编号")
     private String memberNo;
 
 	/**公司id*/
-	@Excel(name = "公司id", width = 15)
     @ApiModelProperty(value = "公司id")
     private String companyId;
 
@@ -76,7 +76,7 @@ public class TbMemberProjectSubitem implements Serializable {
     private String companyName;
 
 	/**会员类型*/
-	@Excel(name = "会员类型", width = 15)
+	@Excel(name = "会员类型", width = 15,dicCode = "member_type")
     @ApiModelProperty(value = "会员类型")
     @Dict(dicCode = "member_type")
     private Integer memberType;
@@ -87,17 +87,17 @@ public class TbMemberProjectSubitem implements Serializable {
     private String liaisonMan;
 
 	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+	@Excel(name = "邮箱", width = 20,exportConvert = true)
     @ApiModelProperty(value = "邮箱")
     private String email;
 
 	/**手机*/
-	@Excel(name = "手机", width = 15)
+	@Excel(name = "手机", width = 15,exportConvert = true)
     @ApiModelProperty(value = "手机")
     private String mobile;
 
 	/**会员状态*/
-	@Excel(name = "会员状态", width = 15)
+	@Excel(name = "会员状态", width = 15, dicCode = "member_status")
     @ApiModelProperty(value = "会员状态")
     @Dict(dicCode = "member_status")
     private Integer memberStatus;
@@ -110,28 +110,36 @@ public class TbMemberProjectSubitem implements Serializable {
     private java.util.Date registerTime;
 
 	/**打包*/
-	@Excel(name = "打包", width = 15)
+	@Excel(name = "打包", width = 15,dicCode = "yn")
     @ApiModelProperty(value = "打包")
     private Integer pack;
 
 	/**需要发票*/
-	@Excel(name = "需要发票", width = 15)
+	@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     @ApiModelProperty(value = "需要发票")
     private Integer invoiceRequirements;
 
 	/**到账*/
-	@Excel(name = "到账", width = 15)
+	@Excel(name = "到账", width = 15,dicCode = "account_type")
     @ApiModelProperty(value = "到账")
     private Integer inAccount;
 
 	/**开票*/
-	@Excel(name = "开票", width = 15)
+	@Excel(name = "开票", width = 15,dicCode = "make_invoice_type")
     @ApiModelProperty(value = "开票")
     private Integer makeInvoice;
 
 	/**邮寄*/
-	@Excel(name = "邮寄", width = 15)
+	@Excel(name = "邮寄", width = 15,dicCode = "mail_type")
     @ApiModelProperty(value = "邮寄")
     private Integer mail;
 
+    public String convertisEmail(){
+        return PasswordUtil.decrypt(email);
+    }
+
+    public String convertisMobile(){
+        return PasswordUtil.decrypt(mobile);
+    }
+
 }