Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/pages/service_shop/shop_list.vue

@@ -58,7 +58,7 @@ export default {
           this.filterNames = [];
           break;
         case "comprehensive_app_list":
-          this.name = "综合应用";
+          this.name = "融合服务";
           this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
           this.filterNames = ["服务类型", "服务领域", "服务来源组织"];

src/pages/service_shop/zhfwDetail.vue

@@ -4,7 +4,7 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item to="/shop">服务超市</el-breadcrumb-item>
         <el-breadcrumb-item to="/shop/comprehensive_app_list/11">
-          综合应用
+          融合服务
         </el-breadcrumb-item>
         <el-breadcrumb-item>服务详情信息</el-breadcrumb-item>
       </el-breadcrumb>