Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 e09449ffcf303f67f5bbd168383b285600a251ec

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