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

jyy

2021-03-17 0f66a8dc0544e72b0d41adfc69db20ea584c4661

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