From f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Category.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 62bdcfd..6193e3a 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
@@ -79,7 +79,7 @@
@ExcelColumn(name="鎺掑簭鐮侊紙鍗囧簭锛�")
private Integer sortnum;
- @ApiModelProperty(value = "闄勫睘瀛楁1 (type=1:鏄惁闇�瑕佷笂浼犻┚椹惰瘉锛�0=涓嶉渶瑕侊紱1=闇�瑕侊紱) ")
+ @ApiModelProperty(value = "闄勫睘瀛楁1 (type=1:鏄惁闇�瑕佷笂浼犻┚椹惰瘉锛�0=涓嶉渶瑕侊紱1=闇�瑕侊紱type=3:鏄惁璐甸噸鐗╁搧锛�0=鍚︼紱1=鏄紱type=4:灏哄鎻忚堪锛�) ")
@ExcelColumn(name="鍐呭")
private String otherField;
@@ -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