Merge branch 'api' into hive2.0

Helius

2021-03-22 95e25505521e3a2170f5867c211bf784f1032eba

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