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

jyy

2021-07-10 1ee0a09016bd72b508456b23dae1afab44cd856b

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