Merge branch 'score_shop' into api_score_meger

jyy

2021-07-12 9b1860f14489c81a9dd581d29e83289a5e114ace

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