0416

src/main/java/cn/ezhizao/framework/web/domain/BaseEntity.java

@@ -1,10 +1,10 @@
 package cn.ezhizao.framework.web.domain;
 
-import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.Version;
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -28,7 +28,6 @@ public class BaseEntity implements Serializable {
     /**
      * 主键
      */
-    @TableField("id")
     private Long id;
 
     /**
@@ -37,6 +36,12 @@ public class BaseEntity implements Serializable {
     @TableField(value = "tenant_id")
     private Long tenantId;
 
+    /**
+     * 租户名称
+     */
+    @TableField(exist = false)
+    private String tenantName;
+
     /**
      * 搜索值
      */
@@ -55,7 +60,7 @@ public class BaseEntity implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
-    @Excel(name = "发单日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 6)
+//    @Excel(name = "发单日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 6)
     private Date createTime;
 
     /**
@@ -100,7 +105,7 @@ public class BaseEntity implements Serializable {
     /**
      * 备注
      */
-    @Excel(name = "备注")
+//    @Excel(name = "备注")
     @TableField(exist = false)
     private String remark;
 
@@ -135,6 +140,14 @@ public class BaseEntity implements Serializable {
         this.tenantId = tenantId;
     }
 
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
     public String getCreateBy() {
         return createBy;
     }