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 | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 128108a..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
@@ -49,8 +52,14 @@
@ApiModelProperty(value = "鍏宠仈閰嶉�佸尯鍩烮D")
private String areaId;
+ @ApiModelProperty(value = "鍏宠仈閰嶉�佸尯鍩熷垎娈礗D")
+ private String areaSectionId;
+
@ApiModelProperty(value = "0:姝ｅ父 1:涓嶆椿璺冿紙榛樿=0锛�")
private int status;
+
+ @ApiModelProperty(value = "1锛氶渶瑕佸嫎楠岋紝2锛氬凡鍕橀獙")
+ private Integer kstatus;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -60,13 +69,17 @@
@ApiModelProperty(value = "鍟嗘埛娉ㄥ唽鍦板潃")
private String registeredAddress;
- @ApiModelProperty(value = "鑱旂郴浜�")
+ @ApiModelProperty(value = "鑱旂郴浜� 娉曚汉")
private String linker;
- @ApiModelProperty(value = "闆跺敭璁稿彲璇佷俊鎭紙鍥剧墖锛熸枃瀛楋紵锛�")
+ @ApiModelProperty(value = "闆跺敭璁稿彲璇�")
private String licence;
@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