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

jyy

2021-05-17 af0fec046a86c63ec007791efdad51ffecf78ae2

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