diff --git a/sql/3.1升级3.2sql.sql b/sql/3.1升级3.2sql.sql index 58a8d986..ff739d43 100644 --- a/sql/3.1升级3.2sql.sql +++ b/sql/3.1升级3.2sql.sql @@ -19,11 +19,11 @@ CREATE TABLE `yx_store_canvas` ( `canvas_id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '画布id', `terminal` tinyint(1) NOT NULL COMMENT '终端 1-小程序 2-H5 3-APP 4-PC', `json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '画布json数据', - `type` tinyint(1) NOT NULL DEFAULT 1 COMMENT '类型 1-系统画布 2-自定义页面 3-商家店铺装修', + `type` tinyint(1) DEFAULT 1 COMMENT '类型 1-系统画布 2-自定义页面 3-商家店铺装修', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '名称', - `shop_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '店铺id,当type=3的时候,值为具体的店铺id,其它情况为0', - `create_time` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建时间', - `update_time` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改时间', + `shop_id` bigint(20) DEFAULT 0 COMMENT '店铺id,当type=3的时候,值为具体的店铺id,其它情况为0', + `create_time` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_time` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间', `is_del` tinyint(1) NULL DEFAULT NULL COMMENT '删除标识', PRIMARY KEY (`canvas_id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '画布信息表' ROW_FORMAT = DYNAMIC; diff --git a/sql/yshop3.2.sql b/sql/yshop3.2.sql index b5ecda70..cd49c63e 100644 --- a/sql/yshop3.2.sql +++ b/sql/yshop3.2.sql @@ -7356,11 +7356,11 @@ CREATE TABLE `yx_store_canvas` ( `canvas_id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT '画布id', `terminal` tinyint(1) NOT NULL COMMENT '终端 1-小程序 2-H5 3-APP 4-PC', `json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '画布json数据', - `type` tinyint(1) NOT NULL DEFAULT 1 COMMENT '类型 1-系统画布 2-自定义页面 3-商家店铺装修', + `type` tinyint(1) DEFAULT 1 COMMENT '类型 1-系统画布 2-自定义页面 3-商家店铺装修', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '名称', - `shop_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '店铺id,当type=3的时候,值为具体的店铺id,其它情况为0', - `create_time` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建时间', - `update_time` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改时间', + `shop_id` bigint(20) DEFAULT 0 COMMENT '店铺id,当type=3的时候,值为具体的店铺id,其它情况为0', + `create_time` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_time` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间', `is_del` tinyint(1) NULL DEFAULT NULL COMMENT '删除标识', PRIMARY KEY (`canvas_id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '画布信息表' ROW_FORMAT = DYNAMIC; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/canvas/domain/StoreCanvas.java b/yshop-mall/src/main/java/co/yixiang/modules/canvas/domain/StoreCanvas.java index 5f892171..2db9d053 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/canvas/domain/StoreCanvas.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/canvas/domain/StoreCanvas.java @@ -34,7 +34,6 @@ public class StoreCanvas extends BaseDomain { private String json; /** 类型 1-系统画布 2-自定义页面 3-商家店铺装修 */ - @NotNull private Integer type; /** 名称 */ @@ -42,7 +41,6 @@ public class StoreCanvas extends BaseDomain { private String name; /** 店铺id,当type=3的时候,值为具体的店铺id,其它情况为0 */ - @NotNull private Long shopId;