Merge branch 'develop'

935090232@qq.com

2022-03-07 63ba1d6a77860f0c4e6e49a59577a7eb0cfbbe02

 zq-erp/src/main/resources/config/db/increment/签到活动.sql

@@ -187,6 +187,12 @@
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`;