Merge branch 'master' into hive2.0

wzy

2020-12-14 08e86badef73810418add083b21ba64bff74700c

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