Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-27 19dc607fe5fd18531d6deaa4fe8540b602585723

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