From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index b2f5efa..81cdb04 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -25,56 +25,64 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
- @ExcelColumn(name="涓婚敭")
+ //@ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ //@ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+ //@ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name="鍚嶇О")
+ @ExcelColumn(name="浜岀骇鍒嗙被鍚嶇О",index = 2,width = 12)
private String name;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
- @ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
+ //@ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�")
- @ExcelColumn(name="鎺掑簭鐮�")
+ //@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "鍥炬爣")
- @ExcelColumn(name="鍥炬爣")
+ //@ExcelColumn(name="鍥炬爣")
private String imgurl;
@ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
- @ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
+ //@ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
private Integer type;
@ApiModelProperty(value = "鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
- @ExcelColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
+ //@ExcelColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
private Integer parentId;
+ @ApiModelProperty(value = "鐖剁骇鍚嶇О ")
+ @TableField(exist = false)
+ @ExcelColumn(name="涓�绾у垎绫诲悕绉�",index = 1,width = 12)
+ private String parentName;
+ @ApiModelProperty(value = "缁勫悎鍚嶇О ")
+ @TableField(exist = false)
+ @ExcelColumn(name="缁勫悎鍚嶇О",index = 3,width = 20)
+ private String groupName;
@ApiModelProperty(value = "瀛愰泦鍒嗙被")
@TableField(exist = false)
--
Gitblit v1.9.3