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

jyy

2020-12-09 95cdd1c5f86bf7ec5af17a07d819976a0365b5d7

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