From cc4c386f1883667651321bb0fc7b57c71b6d0dc4 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 17 四月 2026 20:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Category.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 ffbc6d3..7905e9e 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
@@ -67,34 +67,33 @@
@ExcelColumn(name="绫诲瀷:1=杞﹁締绫诲瀷;2=鐗╁搧鍒嗙被;3=鐗╁搧绛夌骇;4=鐗╁搧灏哄;")
private Integer type;
- @ApiModelProperty(value = "鍐呭 锛坱ype=1锛氶�氳鏂瑰紡; type=2锛氬徃鏈鸿瘎绾э級;")
+ @ApiModelProperty(value = "鍐呭 锛坱ype=1锛氶�氳鏂瑰紡 鏈哄姩杞� = driving 闈炴満鍔ㄨ溅 = bicycling ; type=2=瀵勫瓨璇存槑 锛� type=3锛氬徃鏈鸿瘎绾э紱type=4:鏄惁鐗瑰ぇ灏哄 0=鍚︼紱1=鏄紱锛�;")
@ExcelColumn(name="鍐呭")
private String detail;
- @ApiModelProperty(value = "鍥炬爣锛堣溅杈嗙被鍨嬩娇鐢級")
- @ExcelColumn(name="鍥炬爣锛堣溅杈嗙被鍨嬩娇鐢級")
+ @ApiModelProperty(value = "鍥炬爣锛堢墿鍝佸昂瀵镐娇鐢級")
+ @ExcelColumn(name="鍥炬爣锛堢墿鍝佸昂瀵镐娇鐢級")
private String icon;
@ApiModelProperty(value = "鎺掑簭鐮侊紙鍗囧簭锛�")
@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;
- @ApiModelProperty(value = "鏄惁鍥哄畾杞﹁締", example = "1")
- @ExcelColumn(name="鏄惁鍥哄畾杞﹁締")
- private Integer isFixed; // 寮冪敤
+
+ @ApiModelProperty(value = "鑷叧鑱斾富閿細鐗╁搧鍒嗙被浣跨敤 鍏宠仈鐗╁搧绛夌骇", example = "1")
+ @ExcelColumn(name="鑷叧鑱斾富閿�")
+ private Integer relationId; // 寮冪敤
- @ApiModelProperty(value = "鏄惁鍥哄畾杞﹁締锛堣溅杈嗙被鍨嬩娇鐢級:0=鍚︼紱1=鏄紱", example = "1")
+
+ @ApiModelProperty(value = "淇敼浜�", example = "1")
@TableField(exist = false)
private String updateUserName;
- @ApiModelProperty(value = "椁愭爣绛夐厤缃」闆嗗悎", example = "1")
- @TableField(exist = false)
- private JSONArray detailList;
@ApiModelProperty(value = "鍥炬爣鍏ㄨ矾寰�")
@TableField(exist = false)
--
Gitblit v1.9.3