Merge branch 'score_shop' into api_score_meger

jyy

2021-07-15 a43e210f39562bbbdc25f75ec3aaad94ae33dfbf

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