Merge branch 'master' of http://192.168.101.10:13000/boman/boman-framwork

ruoyi-ui/src/api/system/table.js

@@ -11,7 +11,7 @@ export function getQueryList(data) {
 // 获取表单查询字段、按钮、表头
 export function getTableQuery(data) {
   return request({
-    url: '/boman-web-core/p/cs/objectTab',
+    url: '/boman-web-core/p/cs/getObject',
     method: 'POST',
     data
   })

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -9,7 +9,6 @@
           </el-form-item>
         </el-form>
       </el-col>
-
     </el-row>
 
     <el-tabs v-model="activeName">

ruoyi-ui/src/views/tool/gen/index.vue

@@ -127,7 +127,7 @@
       <el-table-column
         label="实际数据库表"
         align="center"
-        prop="className"
+        prop="realTableName"
         :show-overflow-tooltip="true"
       />
       <el-table-column label="是否菜单" align="center">