Merge branch 'api' into hive2.0

jyy

2021-03-08 1cd8df7e8f42fb0d9292055ff97e4e5480087112

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