From 6c4ed4ad15f0105cec56759c279e2f3d24de08c6 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 4 May 2023 09:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=96=B0=E5=A2=9E=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/user/pojo/param/FunctionParam.java     | 3 +++
 .../src/main/java/com/njcn/user/pojo/po/Function.java    | 7 ++++++-
 .../src/main/java/com/njcn/user/pojo/vo/FunctionVO.java  | 2 +-
 .../java/com/njcn/user/mapper/mapping/FunctionMapper.xml | 9 ++++++---
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/FunctionParam.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/FunctionParam.java
index 9f88ab5ff..4b0fa5807 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/FunctionParam.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/FunctionParam.java
@@ -56,6 +56,9 @@ public class FunctionParam {
     @ApiModelProperty("描述")
     private String remark;
 
+    @ApiModelProperty("路由名称")
+    private String routeName;
+
     /**
      * 资源更新操作实体
      * 需要填写的参数：资源的id
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Function.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Function.java
index 0c4c47119..021560365 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Function.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Function.java
@@ -59,7 +59,7 @@ public class Function extends BaseEntity {
     private Integer sort;
 
     /**
-     * 资源类型：0-菜单、1-按钮、2-公共资源、3-服务间调用资源
+     * 资源类型：0-菜单、1-按钮、2-公共资源、3-服务间调用资源 4-tab页
      */
     private Integer type;
 
@@ -73,4 +73,9 @@ public class Function extends BaseEntity {
      */
     private Integer state;
 
+    /**
+     * 路由名称
+     */
+    private String routeName;
+
 }
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/FunctionVO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/FunctionVO.java
index 04d337f12..c7334240a 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/FunctionVO.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/FunctionVO.java
@@ -28,7 +28,7 @@ public class FunctionVO implements Serializable {
     @ApiModelProperty("资源标识")
     private String code;
 
-    @ApiModelProperty("routeName")
+    @ApiModelProperty("路由名称")
     private String routeName;
 
     @ApiModelProperty("路径")
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml
index 7b3639602..dca916bdd 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml
@@ -10,7 +10,8 @@
             Path routePath,
             Icon,Sort,
             Type,
-            Remark
+            Remark,
+            Route_Name routeName
         FROM
             sys_function
         WHERE
@@ -25,7 +26,8 @@
             Path routePath,
             Icon,Sort,
             Type,
-            Remark
+            Remark,
+            Route_Name routeName
         FROM
             sys_function
         WHERE
@@ -45,7 +47,8 @@
         Path routePath,
         Icon,Sort,
         Type,
-        Remark
+        Remark,
+        Route_Name routeName
         FROM
         sys_function
         WHERE