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

jyy

2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536

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