update database script

sql/init/other_table.sql

@@ -383,7 +383,7 @@ CREATE TABLE `mall_ad`  (
 DROP TABLE IF EXISTS `mall_ad_position`;
 CREATE TABLE `mall_ad_position`  (
   `id` tinyint(3) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '\'' COMMENT '广告位名称',
+  `name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '广告位名称',
   `width` smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '宽度',
   `height` smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '高度',
   `desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '描述',
@@ -1353,7 +1353,8 @@ CREATE TABLE `mall_merch_user`  (
   `tstm` datetime(0) DEFAULT NULL COMMENT '时间戳',
   `is_load_goods` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '门店商品是否有修改，  0：否 1：是',
   PRIMARY KEY (`id`) USING BTREE,
-  INDEX `store_id_merch_sn_index`(`store_id`, `merch_sn`) USING BTREE
+  INDEX `idx_user_id`(`user_id`) USING BTREE
+  INDEX `idx_store_id`(`store_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 77671 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户商户关联表' ROW_FORMAT = Compact;
 
 -- ----------------------------

sql/init/sys_table.sql

@@ -514,7 +514,7 @@ INSERT INTO `sys_menu` VALUES (403, 402, '查看', NULL, 'sys:notice:list,sys:no
 INSERT INTO `sys_menu` VALUES (404, 402, '新增', NULL, 'sys:notice:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (405, 402, '修改', NULL, 'sys:notice:update', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (406, 402, '删除', NULL, 'sys:notice:delete', 2, NULL, 6, 0);
-INSERT INTO `sys_menu` VALUES (422, 366, '门店打印机', 'sys/printer.html', NULL, 1, 'fa fa-print', 2, 0);
+INSERT INTO `sys_menu` VALUES (422, 366, '门店打印机', 'sys/printer.html', NULL, 1, 'fa fa-print', 2, 1);
 INSERT INTO `sys_menu` VALUES (423, 422, '查看', NULL, 'sys:printer:list,sys:printer:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (424, 422, '新增', NULL, 'sys:printer:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (425, 422, '修改', NULL, 'sys:printer:update', 2, NULL, 6, 0);
@@ -529,7 +529,7 @@ INSERT INTO `sys_menu` VALUES (444, 357, '门店商品', 'shop/storeProductStock
 INSERT INTO `sys_menu` VALUES (445, 444, '导入', NULL, 'productstorerela:upload', 2, NULL, 3, 0);
 INSERT INTO `sys_menu` VALUES (447, 444, '修改', NULL, 'productstorerela:update', 2, NULL, 2, 0);
 INSERT INTO `sys_menu` VALUES (448, 444, '新增', NULL, 'productstorerela:save', 2, NULL, 1, 0);
-INSERT INTO `sys_menu` VALUES (609, 222, '运费模版', 'shop/freight.html', NULL, 1, 'fa fa-truck', 1, 0);
+INSERT INTO `sys_menu` VALUES (609, 222, '运费模版', 'shop/freight.html', NULL, 1, 'fa fa-truck', 1, 1);
 INSERT INTO `sys_menu` VALUES (610, 609, '查看', NULL, 'freight:list,freight:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (611, 609, '新增', NULL, 'freight:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (612, 609, '修改', NULL, 'freight:update', 2, NULL, 6, 0);
@@ -653,18 +653,18 @@ INSERT INTO `sys_menu` VALUES (860, 859, '支付单信息', 'compared/payorderin
 INSERT INTO `sys_menu` VALUES (861, 859, '支付异常单信息', 'compared/ordercomparederror.html', NULL, 1, 'fa fa-file-code-o', 0, 0);
 INSERT INTO `sys_menu` VALUES (862, 859, '税单导入', 'compared/taxinfo.html', NULL, 1, 'fa fa-file-code-o', 0, 0);
 INSERT INTO `sys_menu` VALUES (863, 859, '税单异常', 'compared/taxcomparederror.html', NULL, 1, 'fa fa-file-code-o', 0, 0);
-INSERT INTO `sys_menu` VALUES (875, 0, '转移管理', NULL, NULL, 0, 'fa fa-leanpub', 3, 0);
-INSERT INTO `sys_menu` VALUES (876, 875, '门店库存转移单表', 'shop/storetransferinventoryorder.html', NULL, 1, 'fa fa-file-code-o', 6, 0);
+INSERT INTO `sys_menu` VALUES (875, 0, '转移管理', NULL, NULL, 0, 'fa fa-leanpub', 3, 1);
+INSERT INTO `sys_menu` VALUES (876, 875, '门店库存转移单表', 'shop/storetransferinventoryorder.html', NULL, 1, 'fa fa-file-code-o', 6, 1);
 INSERT INTO `sys_menu` VALUES (877, 876, '查看', NULL, 'storetransferinventoryorder:list,storetransferinventoryorder:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (878, 876, '新增', NULL, 'storetransferinventoryorder:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (879, 876, '修改', NULL, 'storetransferinventoryorder:update', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (880, 876, '删除', NULL, 'storetransferinventoryorder:delete', 2, NULL, 6, 0);
-INSERT INTO `sys_menu` VALUES (881, 875, '门店库存转移单详情表', 'shop/storetransferinventoryorderdetail.html', NULL, 1, 'fa fa-file-code-o', 6, 0);
+INSERT INTO `sys_menu` VALUES (881, 875, '门店库存转移单详情表', 'shop/storetransferinventoryorderdetail.html', NULL, 1, 'fa fa-file-code-o', 6, 1);
 INSERT INTO `sys_menu` VALUES (882, 881, '查看', NULL, 'storetransferinventoryorderdetail:list,storetransferinventoryorderdetail:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (883, 881, '新增', NULL, 'storetransferinventoryorderdetail:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (884, 881, '修改', NULL, 'storetransferinventoryorderdetail:update', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (885, 881, '删除', NULL, 'storetransferinventoryorderdetail:delete', 2, NULL, 6, 0);
-INSERT INTO `sys_menu` VALUES (888, 1, '快递公司列表', 'sys/expresscompanysys.html', '', 1, 'fa fa-file-code-o', 13, 0);
+INSERT INTO `sys_menu` VALUES (888, 1, '快递公司列表', 'sys/expresscompanysys.html', '', 1, 'fa fa-file-code-o', 13, 1);
 INSERT INTO `sys_menu` VALUES (889, 888, '查看', NULL, 'expresscompanysys:list,expresscompanysys:info', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (890, 888, '新增', NULL, 'expresscompanysys:save', 2, NULL, 6, 0);
 INSERT INTO `sys_menu` VALUES (891, 888, '修改', NULL, 'expresscompanysys:update', 2, NULL, 6, 0);