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

935090232@qq.com

2021-07-29 bf60845c8da9d0099ef25c8e6703351055865a8e

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