From 777bcb6c5660c0ed14d85207377b62b779d81dde Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:08:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/business/model/Category.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Category.java b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
index 7905e9e..59790a6 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Category.java
@@ -63,8 +63,8 @@
@ExcelColumn(name="鍗曚綅鍚嶇О")
private String name;
- @ApiModelProperty(value = "绫诲瀷:1=杞﹁締绫诲瀷;2=鐗╁搧鍒嗙被;3=鐗╁搧绛夌骇;4=鐗╁搧灏哄;", example = "1")
- @ExcelColumn(name="绫诲瀷:1=杞﹁締绫诲瀷;2=鐗╁搧鍒嗙被;3=鐗╁搧绛夌骇;4=鐗╁搧灏哄;")
+ @ApiModelProperty(value = "绫诲瀷:1=杞﹁締绫诲瀷;2=鐗╁搧鍒嗙被;3=鐗╁搧绛夌骇;4=鐗╁搧灏哄;5=浣嶇疆鏍囩;", example = "1")
+ @ExcelColumn(name="绫诲瀷:1=杞﹁締绫诲瀷;2=鐗╁搧鍒嗙被;3=鐗╁搧绛夌骇;4=鐗╁搧灏哄;5=浣嶇疆鏍囩;")
private Integer type;
@ApiModelProperty(value = "鍐呭 锛坱ype=1锛氶�氳鏂瑰紡 鏈哄姩杞� = driving 闈炴満鍔ㄨ溅 = bicycling ; type=2=瀵勫瓨璇存槑 锛� type=3锛氬徃鏈鸿瘎绾э紱type=4:鏄惁鐗瑰ぇ灏哄 0=鍚︼紱1=鏄紱锛�;")
@@ -98,4 +98,16 @@
@ApiModelProperty(value = "鍥炬爣鍏ㄨ矾寰�")
@TableField(exist = false)
private String iconFull;
+
+ @ApiModelProperty(value = "鑷叧鑱斿璞″悕绉�")
+ @TableField(exist = false)
+ private String relationName;
+
+ @ApiModelProperty(value = "鑷叧鑱斿璞therField")
+ @TableField(exist = false)
+ private String relationOtherField;
+
+ @ApiModelProperty(value = "鑷叧鑱斿璞″娉�")
+ @TableField(exist = false)
+ private String relationRemark;
}
--
Gitblit v1.9.3