From f417d6b965a16fb197ac8c49b383fbeedd28e23d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 11 九月 2023 15:44:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/Category.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Category.java b/server/service/src/main/java/com/doumee/dao/business/model/Category.java
index d178550..0c67dbb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -91,6 +91,12 @@
@ApiModelProperty(value = "浼佷笟缂栫爜")
@ExcelColumn(name="浼佷笟缂栫爜")
private Integer companyId;
+ @ApiModelProperty(value = "骞冲彴鍒嗙被缂栫爜")
+ @ExcelColumn(name="骞冲彴鍒嗙被缂栫爜")
+ private Integer platCateId;
+ @ApiModelProperty(value = "绫诲瀷 0鑷缓 1骞冲彴鍏宠仈")
+ @ExcelColumn(name="绫诲瀷")
+ private Integer type;
@ApiModelProperty(value = "鍙傛暟鍚嶇О 鍒楄〃鍊�")
--
Gitblit v1.9.3