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

jyy

2021-03-12 2502f378fc7833f3f8225b9a98bcd2cca9111f91

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