From 4cab5d1219c7ea01e60a0629bf0e9e062be029d1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Apr 2021 16:00:27 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/resources/config/db/increment/签到活动.sql |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git "a/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql" "b/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql"
index 966c947..f7b1b4a 100644
--- "a/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql"
+++ "b/zq-erp/src/main/resources/config/db/increment/\347\255\276\345\210\260\346\264\273\345\212\250.sql"
@@ -184,6 +184,17 @@
 ALTER TABLE `shop_delivery_info`
 ADD COLUMN `receive_id`  bigint(20) NULL COMMENT '奖品领取ID' AFTER `company_id`;
 
+ALTER TABLE `activity_sign_award_set`
+    ADD COLUMN `customer_phone`  varchar(100) NULL COMMENT '客服电话' AFTER `company_id`;
+
+ALTER TABLE `shop_delivery_info`
+    MODIFY COLUMN `order_id`  int(11) NULL AFTER `logistics_company`;
+
+ALTER TABLE `shop_delivery_info`
+    MODIFY COLUMN `order_no`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER `user_id`;
+
+
+
 
 
 

--
Gitblit v1.9.1