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

jyy

2021-04-13 8c383fda066ba6166ec3bf622d44d8b17bfac71f

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