Merge branch 'dev' into system

# Conflicts:
#	src/router/generatedRouter/index.js

src/router/generatedRouter/index.js

@@ -74,6 +74,15 @@ export default [
                   title: '知识库新增',
                   icon: 'el-icon-s-home'
                 }
+              },
+              {
+                path: '/knowledge/detail/segments',
+                name: 'knowledge-segments',
+                component: () => import('@/views/knowledge/detail/components/viewSegments/index.vue'),
+                meta: {
+                  title: '分段查看',
+                  icon: 'el-icon-s-home'
+                }
               }
             ]
           }
@@ -138,6 +147,28 @@ export default [
       }
     ]
   },
+  {
+    path: '/dify',
+    name: 'dify',
+    component: layout,
+    redirect: '/dify/workflow',
+    meta: {
+      title: 'Dify',
+      icon: 'el-icon-home',
+      affix: true
+    },
+    children: [
+      {
+        path: '/dify/workflow',
+        name: 'dify-workflow',
+        component: () => import('@/views/dify/views/workflow/index.vue'),
+        meta: {
+          title: 'Dify',
+          icon: 'el-icon-home'
+        }
+      }
+    ]
+  },
   {
     path: '/system',
     name: 'system',