From fe2b2e037a91fbc22bd887174d37c7dd229333d3 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 09 十一月 2021 15:02:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
index a344651..e67382f 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
@@ -1,6 +1,7 @@
package cn.exrick.xboot.your.entity;
import cn.exrick.xboot.core.base.XbootBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -12,7 +13,9 @@
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
import java.util.Date;
+import java.util.List;
/**
* @author Exrick
@@ -66,7 +69,7 @@
@ApiModelProperty(value = "鍟嗘埛娉ㄥ唽鍦板潃")
private String registeredAddress;
- @ApiModelProperty(value = "鑱旂郴浜�")
+ @ApiModelProperty(value = "鑱旂郴浜� 娉曚汉")
private String linker;
@ApiModelProperty(value = "闆跺敭璁稿彲璇�")
@@ -75,4 +78,8 @@
@ApiModelProperty(value = "鎺ヨ揣浜哄悕绉�")
private String recvName;
+ @Transient
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鎺ヨ揣浜哄垪琛�")
+ private List<CustomerReceive> receives;
}
\ No newline at end of file
--
Gitblit v1.9.1