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

jyy

2021-03-17 1739422c2ab97afea38b08d4bd5468093e264ca2

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