Merge branch 'hive2.0' into api

jyy

2021-01-25 dc1a4670261bc852f643d19a83ffc53eeac1b902

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