From 48b4e46f22ec83843cb8a3087b8ec9511a7ea8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 10:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index b7a30a9..619f61c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,7 +21,7 @@
@Data
@ApiModel("浼佷笟淇℃伅琛�")
@TableName("`company`")
-public class Company {
+public class Company extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
@@ -176,11 +177,11 @@
@ApiModelProperty(value = "娴峰悍閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="娴峰悍閮ㄩ棬绾у埆璺緞")
- private String hk_company_path;
+ private String hkCompanyPath;
@ApiModelProperty(value = "鑷缓閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="鑷缓閮ㄩ棬绾у埆璺緞")
- private String company_path;
+ private String companyPath;
@ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞")
- private String erp_company_path;
+ private String erpCompanyPath;
}
--
Gitblit v1.9.3