From 6bf26cf68e5188affb9f3fe3694456638769007e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 五月 2024 18:04:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
similarity index 96%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
rename to server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index b165a47..ccf1673 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -1,15 +1,15 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
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;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -122,7 +122,7 @@
@ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
@ExcelColumn(name="璐熻矗浜虹紪鐮�")
- private String headId;
+ private Integer headId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -181,9 +181,12 @@
@ApiModelProperty(value = "娴峰悍閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="娴峰悍閮ㄩ棬绾у埆璺緞")
private String hkCompanyPath;
+ @ApiModelProperty(value = "鑷缓閮ㄩ棬缂栫爜绾у埆璺緞", example = "1")
+ @ExcelColumn(name="鑷缓閮ㄩ棬缂栫爜绾у埆璺緞")
+ private String companyPath;
@ApiModelProperty(value = "鑷缓閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="鑷缓閮ㄩ棬绾у埆璺緞")
- private String companyPath;
+ private String companyNamePath;
@ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
@TableField(exist = false)
private String parentCompanyPath;
--
Gitblit v1.9.3