From 967e12a05e1a1cb0c595a379c55c5ecc71dd03a9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 九月 2023 09:08:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/dao/business/model/Brand.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Brand.java b/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
index 7fbe0e1..0869843 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
@@ -58,6 +58,9 @@
@ApiModelProperty(value = "浼佷笟缂栫爜")
@ExcelColumn(name="浼佷笟缂栫爜")
private Integer companyId;
+ @ApiModelProperty(value = "绫诲瀷 0浼佷笟 1骞冲彴")
+ @ExcelColumn(name="绫诲瀷 0浼佷笟 1骞冲彴")
+ private Integer type;
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
@ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@@ -72,6 +75,9 @@
@ApiModelProperty(value = "鍓嶇紑璺緞")
@TableField(exist = false)
- private String prefixUrl;
+ private String imgfullurl;
+ @ApiModelProperty(value = "鍒嗙被涓婚敭")
+ @TableField(exist = false)
+ private Integer categoryId;
}
--
Gitblit v1.9.3