From 0dd4888b9ff79b16448c54e3d5b5c83f3cb5075f Mon Sep 17 00:00:00 2001
From: zhaochencheng <zccbbg@qq.com>
Date: Thu, 17 Nov 2022 18:42:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/generator/service/GenTableServiceImpl.java    | 1 +
 ruoyi-generator/src/test/resources/vm2/sql/sql.vm           | 2 +-
 ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm     | 6 +++---
 sql/mall_pms结构.sql                                      | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index aa01c20..30a7c8c 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -239,6 +239,7 @@ public class GenTableServiceImpl implements IGenTableService {
         genContext.prop2path.put("ClassName", table.getClassName());
         genContext.prop2path.put("className", StrUtil.lowerFirst(table.getClassName()));
         genContext.prop2path.put("tableName", table.getTableName());
+        genContext.prop2path.put("moduleName", table.getModuleName());
 
         // 初始化模板
         VelocityInitializer.initVelocity();
diff --git a/ruoyi-generator/src/test/resources/vm2/sql/sql.vm b/ruoyi-generator/src/test/resources/vm2/sql/sql.vm
index 1e10188..60f8d3e 100644
--- a/ruoyi-generator/src/test/resources/vm2/sql/sql.vm
+++ b/ruoyi-generator/src/test/resources/vm2/sql/sql.vm
@@ -1,6 +1,6 @@
 -- 菜单 SQL
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}', '${parentMenuId}', '1', '${className}', '${moduleName}/${className}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 1, sysdate(), '', null, '${functionName}菜单');
+values('${functionName}', '${parentMenuId}', '1', '${className}', '${rootPermission}/${moduleName}/${className}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 1, sysdate(), '', null, '${functionName}菜单');
 
 -- 按钮父菜单ID
 SELECT @parentId := LAST_INSERT_ID();
diff --git a/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm b/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm
index ed96c69..222c280 100644
--- a/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm
+++ b/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm
@@ -143,7 +143,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
-    <WmsTable v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 #set($count0 = 0)
 #foreach($column in $columns)
@@ -199,7 +199,7 @@
           >删除</el-button>
         </template>
       </el-table-column>
-    </WmsTable>
+    </el-table>
     
     <pagination
       v-show="total>0"
@@ -354,7 +354,7 @@
 </template>
 
 <script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${className}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${env.projectName}/${moduleName}/${className}";
 
 export default {
   name: "${BusinessName}",
diff --git a/sql/mall_pms结构.sql b/sql/mall_pms结构.sql
index 01e7e36..4ad2cf5 100644
--- a/sql/mall_pms结构.sql
+++ b/sql/mall_pms结构.sql
@@ -80,6 +80,7 @@ CREATE TABLE `mall_pms_sku`
     `price`           decimal(10, 2) NULL DEFAULT NULL,
     `pic`             varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '展示图片',
     `sp_data`         varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品销售属性，json格式',
+    `del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标识',
     `create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
     `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
     `update_by` bigint(20) DEFAULT NULL COMMENT '修改人',