From 5b692ef909d8d675b43c5f44b6fac135ab8eb019 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 十一月 2024 18:18:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..9c8f1df 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
@@ -76,7 +76,7 @@
@ExcelColumn(name="鍥炬爣")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐")
+ @ApiModelProperty(value = "绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐 2杩愮淮鍏徃绠$悊")
@ExcelColumn(name="绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐")
private Integer type;
@@ -85,7 +85,7 @@
private Integer categoryId;
- @ApiModelProperty(value = "浼佷笟浠g爜")
+ @ApiModelProperty(value = "浼佷笟浠g爜/绾崇◣璇嗗埆鍙�")
@ExcelColumn(name="浼佷笟浠g爜")
private String code;
--
Gitblit v1.9.3