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

935090232@qq.com

2021-03-18 5d43370b99a03391c9271d04d3f351f0fd734dae

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