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

jyy

2021-07-31 59c430b896ee4577857dc0725bf6a5df4b99e1f7

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