From 682a6e95720bc41cbd42480c2352301496091d89 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 19 九月 2023 19:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/Company.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 12ca91a..77e74b2 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,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -19,7 +20,7 @@
@Data
@ApiModel("绯荤粺-浼佷笟淇℃伅琛�")
@TableName("`company`")
-public class Company {
+public class Company implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
@@ -79,7 +80,7 @@
private Integer salesmanId;
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
- private Byte status;
+ private Integer status;
@ApiModelProperty(value = "閿�鍞汉鍛樺鍚�")
@TableField(exist = false)
--
Gitblit v1.9.3