From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/dao/business/model/CategorySeg.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CategorySeg.java b/server/service/src/main/java/com/doumee/dao/business/model/CategorySeg.java
index b9009cb..2560ff1 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CategorySeg.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CategorySeg.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -48,7 +49,19 @@
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
+ @ApiModelProperty(value = "缁勭粐缂栫爜(F鐮�)")
+ @ExcelColumn(name="缁勭粐缂栫爜(F鐮侊級")
+ private String orgId;
+ @ApiModelProperty(value = "鍝佺墝缂栫爜")
+ @ExcelColumn(name="鍝佺墝缂栫爜")
+ private String brandId;
+ @ApiModelProperty(value = "钀ラ攢鍩庡競")
+ @ExcelColumn(name="钀ラ攢鍩庡競")
+ private String cityAddr;
+ @ApiModelProperty(value = "瀹㈡埛绫诲瀷")
+ @ExcelColumn(name="瀹㈡埛绫诲瀷")
+ private String siteCode;
@ApiModelProperty(value = "鍝佺被缂栫爜")
@ExcelColumn(name="鍝佺被缂栫爜")
private String unitCode;
@@ -63,7 +76,7 @@
@ApiModelProperty(value = "甯傚尯缂栫爜", example = "1")
@ExcelColumn(name="甯傚尯缂栫爜")
- private Integer segId3;
+ private String segId3;
@ApiModelProperty(value = "鎴樺尯鍚嶇О")
@ExcelColumn(name="鎴樺尯鍚嶇О")
@@ -74,8 +87,8 @@
private String segName2;
@ApiModelProperty(value = "甯傚尯鍚嶇О", example = "1")
- @ExcelColumn(name="甯傚尯鍚嶇О")
- private Integer segName3;
+ @ExcelColumn(name="甯傚尯鍚峜绉�")
+ private String segName3;
@ApiModelProperty(value = "鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="鏈�杩戝悓姝ユ椂闂�")
@@ -84,6 +97,9 @@
@ApiModelProperty(value = "鏈�杩戝悓姝ュ娉�")
@ExcelColumn(name="鏈�杩戝悓姝ュ娉�")
private String syncInfo;
+ @ApiModelProperty(value = "鎵�灞炰竴浣撳晢code")
+ @ExcelColumn(name="鎵�灞炰竴浣撳晢code")
+ private String scode;
@ApiModelProperty(value = "鏀惰揣鍦板潃")
@ExcelColumn(name="鏀惰揣鍦板潃")
@@ -96,5 +112,16 @@
@ApiModelProperty(value = "鏀惰揣浜虹數璇�")
@ExcelColumn(name="鏀惰揣浜虹數璇�")
private String shipToPhone;
-
+ @ApiModelProperty(value = "鍝佺墝鍚嶇О")
+ @ExcelColumn(name="鍝佺墝鍚嶇О")
+ @TableField(exist = false)
+ private String unitName;
+ @ApiModelProperty(value = "鍔犵洘鍟嗗悕绉�")
+ @ExcelColumn(name="鍔犵洘鍟嗗悕绉�")
+ @TableField(exist = false)
+ private String orgName;
+ @ApiModelProperty(value = "鎵�灞炰竴浣撳晢")
+ @ExcelColumn(name="鎵�灞炰竴浣撳晢")
+ @TableField(exist = false)
+ private String sname;
}
--
Gitblit v1.9.3