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

jyy

2021-04-20 d85af61932a03bd03663daf9da33177af5824a5c

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