Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-06-19 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7

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