Merge branch 'score_shop' into api_score_meger

jyy

2021-07-17 402bf977071dd04257493b1a38d9e85cca925ae4

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