Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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