From 84a3ef10e4219ad844e6ea86af65d8dec84f28d4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 04 Aug 2021 16:51:28 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/resources/sql |   65 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/gc-shop/src/main/resources/sql b/gc-shop/src/main/resources/sql
index a0f7ea1..6d65312 100644
--- a/gc-shop/src/main/resources/sql
+++ b/gc-shop/src/main/resources/sql
@@ -28,3 +28,68 @@
 ALTER TABLE `xzx_score_goods`
 CHANGE COLUMN `gq_end_time` `qg_end_time`  datetime NULL DEFAULT NULL COMMENT '抢购结束时间' AFTER `qg_start_time`;
 
+ALTER TABLE `xzx_score_goods`
+MODIFY COLUMN `del_flag`  smallint(2) NULL DEFAULT 0 COMMENT '删除标识0 正常 1已删除 ' AFTER `CREATED_TIME`;
+
+ALTER TABLE `xzx_score_goods_category`
+MODIFY COLUMN `del_flag`  smallint(2) NULL DEFAULT 0 COMMENT '删除标识0 正常 1已删除 ' AFTER `CREATED_TIME`;
+
+ALTER TABLE `xzx_score_goods_sku`
+MODIFY COLUMN `del_flag`  smallint(2) NULL DEFAULT 0 COMMENT '删除标识0 正常 1已删除 ' AFTER `CREATED_TIME`;
+
+ALTER TABLE `xzx_score_goods_style`
+MODIFY COLUMN `del_flag`  smallint(2) NULL DEFAULT 0 COMMENT '删除标识0 正常 1已删除 ' AFTER `CREATED_TIME`;
+
+ALTER TABLE `xzx_score_order`
+MODIFY COLUMN `del_flag`  smallint(2) NULL DEFAULT 0 COMMENT '删除标识0 正常 1已删除 ' AFTER `CREATED_TIME`;
+
+ALTER TABLE `xzx_score_order_details`
+MODIFY COLUMN `del_flag`  smallint(2) NULL DEFAULT 0 COMMENT '删除标识0 正常 1已删除 ' AFTER `CREATED_TIME`;
+
+ALTER TABLE `xzx_score_goods`
+ADD COLUMN `category_id`  bigint(20) NULL COMMENT '分类ID' AFTER `price_range`,
+ADD COLUMN `category_name`  varchar(100) NULL COMMENT '分类名称' AFTER `category_id`;
+
+ALTER TABLE `xzx_score_order`
+ADD COLUMN `voucher_img`  varchar(500) NULL COMMENT '凭证' AFTER `remark`;
+
+ALTER TABLE `xzx_user_info`
+MODIFY COLUMN `mobile_phone`  varchar(20) CHARACTER SET utf8mb4 NOT NULL COMMENT '手机号码' AFTER `user_id`;
+
+ALTER TABLE `xzx_user_info`
+MODIFY COLUMN `nick_name`  varchar(100) CHARACTER SET utf8mb4 NULL DEFAULT NULL AFTER `name`;
+
+
+ALTER TABLE `xzx_score_order`
+ADD COLUMN `is_finish`  int(11) NULL DEFAULT 2 COMMENT '后台确认提货  1：是  2：否' AFTER `remark`;
+
+ALTER TABLE `xzx_sys_news`
+DROP COLUMN `del_flag`,
+ADD COLUMN `del_flag`  int(1) NULL DEFAULT 0 COMMENT '删除0:未删除，1:删除' AFTER `picture`;
+
+ALTER TABLE `xzx_sys_news`
+ADD COLUMN `sort`  int(5) NULL DEFAULT 10 COMMENT '排序' AFTER `del_flag`;
+
+ALTER TABLE `xzx_sys_news`
+ADD COLUMN `status`  int(1) NULL DEFAULT 1 COMMENT '状态 1：未发布 2：已发布' AFTER `sort`;
+
+ALTER TABLE `xzx_sys_banner`
+ADD COLUMN `status`  int(1) NULL DEFAULT 1 COMMENT '状态 1：未上架 2：已上架' AFTER `city_id`;
+
+ALTER TABLE `xzx_user_redpaper_rule`
+MODIFY COLUMN `rule_type`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '规则类型：1：红包规则，2：分享分利规则 3阶梯 4推广 5重量返利  7提成 8提佣 9积分规则 10邀请奖励规则' AFTER `share_ratio`;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

--
Gitblit v1.9.1