|  | @@ -2,18 +2,18 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /*增加店铺表*/
 | 
	
		
			
				|  |  |  CREATE TABLE `sale_shop`  (
 | 
	
		
			
				|  |  | -                              `id` bigint NOT NULL AUTO_INCREMENT COMMENT '店铺id',
 | 
	
		
			
				|  |  | -                              `name` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '店铺名称',
 | 
	
		
			
				|  |  | -                              `status` tinyint NOT NULL DEFAULT 1 COMMENT '店铺状态',
 | 
	
		
			
				|  |  | -                              `merchant_id` bigint NOT NULL DEFAULT 0 COMMENT '商户id',
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -                              `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
 | 
	
		
			
				|  |  | -                              `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 | 
	
		
			
				|  |  | -                              `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
 | 
	
		
			
				|  |  | -                              `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 | 
	
		
			
				|  |  | -                              `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
 | 
	
		
			
				|  |  | -                              `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
 | 
	
		
			
				|  |  | -                              PRIMARY KEY (`id`) USING BTREE
 | 
	
		
			
				|  |  | +  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '店铺id',
 | 
	
		
			
				|  |  | +  `name` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '店铺名称',
 | 
	
		
			
				|  |  | +  `status` tinyint NOT NULL DEFAULT 1 COMMENT '店铺状态',
 | 
	
		
			
				|  |  | +  `merchant_id` bigint NOT NULL DEFAULT 0 COMMENT '商户id',
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
 | 
	
		
			
				|  |  | +  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 | 
	
		
			
				|  |  | +  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
 | 
	
		
			
				|  |  | +  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 | 
	
		
			
				|  |  | +  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
 | 
	
		
			
				|  |  | +  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
 | 
	
		
			
				|  |  | +  PRIMARY KEY (`id`) USING BTREE
 | 
	
		
			
				|  |  |  ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '店铺表' ROW_FORMAT = Dynamic;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -31,23 +31,27 @@ ALTER TABLE trade_delivery_pick_up_store ADD COLUMN shop_id bigint COMMENT '店
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /*增加商户表*/
 | 
	
		
			
				|  |  |  CREATE TABLE `sale_merchant`  (
 | 
	
		
			
				|  |  | -                                  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '商户id',
 | 
	
		
			
				|  |  | -                                  `name` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商户名称',
 | 
	
		
			
				|  |  | -                                  `status` tinyint NOT NULL DEFAULT 1 COMMENT '商户状态',
 | 
	
		
			
				|  |  | -                                  `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '商户描述',
 | 
	
		
			
				|  |  | -                                  `contact` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '负责人',
 | 
	
		
			
				|  |  | -                                  `address` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '地址',
 | 
	
		
			
				|  |  | -                                  `contact_number` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '负责人电话',
 | 
	
		
			
				|  |  | -                                  `website` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '官网',
 | 
	
		
			
				|  |  | -                                  `expire_time` datetime NULL COMMENT '到期时间',
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -                                  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
 | 
	
		
			
				|  |  | -                                  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 | 
	
		
			
				|  |  | -                                  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
 | 
	
		
			
				|  |  | -                                  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 | 
	
		
			
				|  |  | -                                  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
 | 
	
		
			
				|  |  | -                                  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
 | 
	
		
			
				|  |  | -                                  PRIMARY KEY (`id`) USING BTREE
 | 
	
		
			
				|  |  | +  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '商户id',
 | 
	
		
			
				|  |  | +  `name` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商户名称',
 | 
	
		
			
				|  |  | +  `status` tinyint NOT NULL DEFAULT 1 COMMENT '商户状态,关联商户状态表',
 | 
	
		
			
				|  |  | +  `description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '简介',
 | 
	
		
			
				|  |  | +  `contact` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '负责人',
 | 
	
		
			
				|  |  | +  `address` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '所在地',
 | 
	
		
			
				|  |  | +  `contact_number` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '负责人电话',
 | 
	
		
			
				|  |  | +  `website` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '官网',
 | 
	
		
			
				|  |  | +  `complaints_hotline` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '维权电话',
 | 
	
		
			
				|  |  | +  `customer_service_hotline` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '客服电话',
 | 
	
		
			
				|  |  | +  `email` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '邮箱',
 | 
	
		
			
				|  |  | +  `business_license_picture` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '营业执照图片路径',
 | 
	
		
			
				|  |  | +  `expire_time` datetime NULL COMMENT '服务到期时间',
 | 
	
		
			
				|  |  | +  
 | 
	
		
			
				|  |  | +  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
 | 
	
		
			
				|  |  | +  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 | 
	
		
			
				|  |  | +  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
 | 
	
		
			
				|  |  | +  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 | 
	
		
			
				|  |  | +  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
 | 
	
		
			
				|  |  | +  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
 | 
	
		
			
				|  |  | +  PRIMARY KEY (`id`) USING BTREE
 | 
	
		
			
				|  |  |  ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '店铺表' ROW_FORMAT = Dynamic;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  ALTER TABLE product_property ADD COLUMN merchant_id bigint COMMENT '商户id';  --  商品属性项表加店铺id
 | 
	
	
		
			
				|  | @@ -66,16 +70,16 @@ ALTER TABLE product_spu ADD COLUMN hidden bit(1) NOT NULL DEFAULT b'0' COMMENT '
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /*增加店铺状态表*/
 | 
	
		
			
				|  |  |  CREATE TABLE `sale_shop_status`  (
 | 
	
		
			
				|  |  | -                                     `id` bigint NOT NULL COMMENT 'id',
 | 
	
		
			
				|  |  | -                                     `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '名称',
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -                                     `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
 | 
	
		
			
				|  |  | -                                     `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 | 
	
		
			
				|  |  | -                                     `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
 | 
	
		
			
				|  |  | -                                     `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 | 
	
		
			
				|  |  | -                                     `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
 | 
	
		
			
				|  |  | -                                     `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
 | 
	
		
			
				|  |  | -                                     PRIMARY KEY (`id`) USING BTREE
 | 
	
		
			
				|  |  | +  `id` bigint NOT NULL COMMENT 'id',
 | 
	
		
			
				|  |  | +  `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '名称',
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
 | 
	
		
			
				|  |  | +  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 | 
	
		
			
				|  |  | +  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
 | 
	
		
			
				|  |  | +  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 | 
	
		
			
				|  |  | +  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
 | 
	
		
			
				|  |  | +  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
 | 
	
		
			
				|  |  | +  PRIMARY KEY (`id`) USING BTREE
 | 
	
		
			
				|  |  |  ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '店铺状态表' ROW_FORMAT = Dynamic;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  INSERT INTO sale_shop_status (id,name) VALUES(1,'营业中');
 | 
	
	
		
			
				|  | @@ -86,16 +90,16 @@ commit;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /*增加用户类型表*/
 | 
	
		
			
				|  |  |  CREATE TABLE `system_user_category`  (
 | 
	
		
			
				|  |  | -                                         `id` bigint NOT NULL COMMENT 'id',
 | 
	
		
			
				|  |  | -                                         `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '名称',
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -                                         `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
 | 
	
		
			
				|  |  | -                                         `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 | 
	
		
			
				|  |  | -                                         `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
 | 
	
		
			
				|  |  | -                                         `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 | 
	
		
			
				|  |  | -                                         `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
 | 
	
		
			
				|  |  | -                                         `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
 | 
	
		
			
				|  |  | -                                         PRIMARY KEY (`id`) USING BTREE
 | 
	
		
			
				|  |  | +  `id` bigint NOT NULL COMMENT 'id',
 | 
	
		
			
				|  |  | +  `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '名称',
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
 | 
	
		
			
				|  |  | +  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
 | 
	
		
			
				|  |  | +  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
 | 
	
		
			
				|  |  | +  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
 | 
	
		
			
				|  |  | +  `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
 | 
	
		
			
				|  |  | +  `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
 | 
	
		
			
				|  |  | +  PRIMARY KEY (`id`) USING BTREE
 | 
	
		
			
				|  |  |  ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '店铺状态表' ROW_FORMAT = Dynamic;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  INSERT INTO system_user_category (id,name) VALUES(1,'系统管理员');
 | 
	
	
		
			
				|  | @@ -108,7 +112,7 @@ ALTER TABLE system_role ADD COLUMN category_id bigint NULL COMMENT '用户类型
 | 
	
		
			
				|  |  |  ALTER TABLE system_menu ADD COLUMN category_id bigint NULL COMMENT '用户类型'; -- 菜单表添加用户类型字段
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /*用户表system_users还要添加店铺ID字段*/
 | 
	
		
			
				|  |  | -ALTER TABLE system_users ADD COLUMN shop_id bigint NULL COMMENT '店铺id';
 | 
	
		
			
				|  |  | +ALTER TABLE system_users ADD COLUMN shop_id bigint NULL COMMENT '店铺id'; 
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 |