Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-05-19 23f5815a2327bde2a5259be3e83909c1aee94105

1
2
ALTER TABLE  `bus_parameter_settings`
ADD COLUMN `shop_id` bigint(0) NULL COMMENT '门店id' AFTER `company_id`;