From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/config/db/increment/签到活动.sql |    8 ++++++++
 1 files changed, 8 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 33e3533..747c41f 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"
@@ -125,6 +125,14 @@
 ALTER TABLE `activity_sign_award_set`
     ADD COLUMN `coupon_name`  varchar(200) NULL COMMENT '优惠券名' AFTER `score_cnt`;
 
+ALTER TABLE `activity_sign_record`
+    CHANGE COLUMN `open_id` `user_id`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'openID' AFTER `id`;
+
+ALTER TABLE `activity_sign_receive_record`
+    CHANGE COLUMN `open_id` `user_id`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'openID' AFTER `id`;
+
+
+
 
 
 

--
Gitblit v1.9.1