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

jyy

2021-01-25 be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f

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