Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-24 b8f7e58b5c626987816335889c96a25a697bf7e9

 zq-erp/src/main/resources/config/db/increment/签到活动.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`;