Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue

@@ -275,7 +275,8 @@ export default {
     // 编辑
     handleEdit(row) {
       this.title = "编辑";
-      this.$refs.AddData.onEdit(row);
+      let data = this.$_.cloneDeep(row);
+      this.$refs.AddData.onEdit(data);
       this.AddVisible = true;
     },
     // 选择

base-manager-ui/admin/src/pages/basicset/system/System.vue

 <template>
   <div class="system flex flexc">
     <a-tabs :activeKey="activeKey" @change="changeRouter">
-      <a-tab-pane key="/system/user">
+      <!-- <a-tab-pane key="/system/user">
         <span slot="tab">
           <a-icon type="user" />
           用户管理
@@ -24,7 +24,7 @@
           <a-icon type="deployment-unit" />
           维度管理
         </span>
-      </a-tab-pane>
+      </a-tab-pane> -->
       <a-tab-pane key="/system/parameter">
         <span slot="tab">
           <a-icon type="container" />

base-manager-ui/admin/src/router/config.js

@@ -306,7 +306,7 @@ const options = {
           meta: {
             icon: "global",
           },
-          redirect: "system/user",
+          redirect: "system/parameter",
           children: [
             {
               path: "user",