Merge branch 'score_shop' into api_score_meger

jyy

2021-07-10 3213b15129d5d7cb63df8f197fbc8f7793ae3a03

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