From 9dc0d681e17d735ff42195a29e6905f4ee9f01da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 六月 2025 09:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/Company.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Company.java b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
index 09bc4dc..691b1b8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -20,7 +22,7 @@
@Data
@ApiModel("浼佷笟淇℃伅琛�")
@TableName("`company`")
-public class Company {
+public class Company implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -33,7 +35,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +44,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -68,8 +70,8 @@
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
- @ApiModelProperty(value = "绫诲瀷 ", example = "1")
- @ExcelColumn(name="绫诲瀷 ")
+ @ApiModelProperty(value = "绫诲瀷 0浼佷笟 1鍟嗘埛 ", example = "1")
+ @ExcelColumn(name="绫诲瀷 0浼佷笟 1鍟嗘埛 ")
private Integer type;
@ApiModelProperty(value = "缁熶竴淇＄敤浠ｇ爜")
@@ -124,7 +126,7 @@
@ApiModelProperty(value = "鐢靛瓙绛捐璇佹椂闂�")
@ExcelColumn(name="鐢靛瓙绛捐璇佹椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date signDate;
@ApiModelProperty(value = "鏌ヨ杈ㄨ瘑 0鏉冮檺鑼冨洿鍐� 1鍏ㄩ儴")
@TableField(exist = false)
@@ -149,6 +151,9 @@
@ApiModelProperty(value = "楠岃瘉鐮�")
@TableField(exist = false)
private String captche;
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜")
+ @TableField(exist = false)
+ private Integer userId;
--
Gitblit v1.9.3