Merge branch 'dev' of http://git.local.topsunit.com/ximai/mes-ui into dev

src/views/tool/gen/genInfoForm.vue

@@ -15,7 +15,7 @@
         <el-form-item prop="packageName">
           <span slot="label">
             生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
+            <el-tooltip content="生成在哪个java包下，例如 com.test.system" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
@@ -23,6 +23,18 @@
         </el-form-item>
       </el-col>
 
+      <el-col :span="12">
+        <el-form-item prop="childPackageName">
+          <span slot="label">
+            子包名
+            <el-tooltip content="例如 com.test.system.controller.子包名" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.childPackageName" />
+        </el-form-item>
+      </el-col>
+
       <el-col :span="12">
         <el-form-item prop="moduleName">
           <span slot="label">

src/views/tool/swagger/index.vue

@@ -8,7 +8,7 @@ export default {
   components: { iFrame },
   data() {
     return {
-      url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
+      url: process.env.VUE_APP_BASE_API + "/doc.html"
     };
   },
 };