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/Segments.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Segments.java b/server/service/src/main/java/com/doumee/dao/business/model/Segments.java
index fc2ed0f..8eeef2f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Segments.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Segments.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;
@@ -60,6 +61,13 @@
@ApiModelProperty(value = "涓婄骇鍖哄煙缂栫爜")
@ExcelColumn(name="涓婄骇鍖哄煙缂栫爜")
private String parentId;
+ @ApiModelProperty(value = "鍝佺墝")
+ @ExcelColumn(name="鍝佺墝")
+ private String unitCode;
+ @ApiModelProperty(value = "鍝佺墝鍚嶇О")
+ @ExcelColumn(name="鍝佺墝鍚嶇О")
+ @TableField(exist = false)
+ private String unitName;
@ApiModelProperty(value = "鐘舵��", example = "1")
@ExcelColumn(name="鐘舵��")
@@ -71,7 +79,7 @@
@ApiModelProperty(value = "绫诲瀷 0鎴樺尯 1鐪佸尯 2甯傚尯")
@ExcelColumn(name="绫诲瀷 0鎴樺尯 1鐪佸尯 2甯傚尯")
- private String type;
+ private Integer type;
@ApiModelProperty(value = "鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="鏈�杩戝悓姝ユ椂闂�")
--
Gitblit v1.9.3