Merge branch 'score_shop' into api_score_meger

jyy

2021-08-02 b72820410a7989da5c645bedb849dc7cccb8faed

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