From 698848bc8586f7c927e0468d6e60711c323d029d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 二月 2025 18:22:43 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 03ae864..b55e513 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
@@ -55,6 +55,12 @@
@ApiModelProperty(value = "鍚嶇О")
@ExcelColumn(name="鍚嶇О")
private String name;
+ @ApiModelProperty(value = "鍏徃绠�绉�")
+ @ExcelColumn(name="鍏徃绠�绉�")
+ private String shortName;
+ @ApiModelProperty(value = "鍏徃鍦板潃")
+ @ExcelColumn(name="鍏徃鍦板潃")
+ private String address;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
@@ -76,8 +82,8 @@
@ExcelColumn(name="鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐")
- @ExcelColumn(name="绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐")
+ @ApiModelProperty(value = "绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐 2杩愮淮璐㈠姟鍏徃绠＄悊")
+ @ExcelColumn(name="绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐 2杩愮淮璐㈠姟鍏徃绠＄悊")
private Integer type;
@ApiModelProperty(value = "鍒嗙被缂栫爜(鍏宠仈category)")
@@ -85,7 +91,7 @@
private Integer categoryId;
- @ApiModelProperty(value = "浼佷笟浠ｇ爜")
+ @ApiModelProperty(value = "浼佷笟浠ｇ爜/绾崇◣璇嗗埆鍙�")
@ExcelColumn(name="浼佷笟浠ｇ爜")
private String code;
@@ -193,6 +199,9 @@
@ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐", example = "1")
@TableField(exist = false)
private String parentType;
+ @ApiModelProperty(value = "璐㈠姟璐︽埛鏁伴噺", example = "1")
+ @TableField(exist = false)
+ private Integer accountNum;
@ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1")
@ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞")
private String erpCompanyPath;
--
Gitblit v1.9.3