From 3668d4433f8db668ff506fcfb0488e7f40ff8382 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 六月 2024 15:47:10 +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 | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/system_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
index 2620950..abecdd5 100644
--- a/server/system_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
@@ -122,7 +122,7 @@
@ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
@ExcelColumn(name="璐熻矗浜虹紪鐮�")
- private String headId;
+ private Integer headId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -190,6 +190,9 @@
@ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
@TableField(exist = false)
private String parentCompanyPath;
+ @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐", example = "1")
+ @TableField(exist = false)
+ private String parentType;
@ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞")
private String erpCompanyPath;
--
Gitblit v1.9.3