Merge branch 'hive2.0' into score_shop

Helius

2021-04-06 1037ab6df799bd49c0f10adf1c048cd5ccc7e3e8

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