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/CustomerReceive.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java index ae9c813..dc100e5 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java +++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/CustomerReceive.java @@ -1,18 +1,17 @@ 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; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Entity; import javax.persistence.Table; -import java.util.Date; +import javax.persistence.Transient; /** * @author Exrick @@ -37,4 +36,17 @@ @ApiModelProperty(value = "鑱旂郴鏂瑰紡") private String phone; + @ApiModelProperty(value = "鐘舵��(0:寰呭鏍� 1锛氬鏍搁�氳繃 2锛氬鏍告湭閫氳繃)") + private int status; + + @ApiModelProperty(value = "鏈�氳繃鍘熷洜") + private String content; + + @Transient + @TableField(exist = false) + private String customerName; + + @ApiModelProperty(value = "澶村儚") + private String img; + } \ No newline at end of file -- Gitblit v1.9.1