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

jyy

2021-03-12 b12efd16399d217756bf71b92d88b29bd4781295

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