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

jyy

2021-03-08 ca982eb586579947e6fcfc0b6a2231b3c29fc91b

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