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

jyy

2021-06-12 4ad105d87c06b9d7ded694451ea752cbbad9e129

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