From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java b/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java
index 0ee884a..39c3cb4 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsMenuVo.java
@@ -9,7 +9,6 @@
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -24,10 +23,10 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("ums_menu")
-@ApiModel(value="UmsMenuVo瀵硅薄", description="鑷畾涔夎彍鍗曡緭鍑�")
+@ApiModel(value = "UmsMenuVo瀵硅薄", description = "鑷畾涔夎彍鍗曡緭鍑�")
 public class UmsMenuVo implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -50,11 +49,20 @@
     @ApiModelProperty(value = "鍓嶇鍚嶇О")
     private String name;
 
+    @ApiModelProperty(value = "鍓嶇璺緞")
+    private String url;
+
     @ApiModelProperty(value = "鍓嶇鍥炬爣")
     private String icon;
 
     @ApiModelProperty(value = "鍓嶇闅愯棌")
     private Integer hidden;
 
+    @ApiModelProperty(value = "鍏崇郴id")
+    private Long relationId;
+
+    @ApiModelProperty(value = "鏄惁寮�鍚�")
+    private Integer isStart;
+
     List<UmsMenuVo> menuVoArrayList;
 }

--
Gitblit v1.8.0