Merge branch 'api' into hive2.0

Helius

2021-01-28 f935e297274e5e75b5c16be62d14b000007ef832

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