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

xiaoyong931011

2021-03-12 6d47ae98e2cc860299bfb976bec226d99a0bcd1b

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