Merge branch 'api' into hive2.0

jyy

2021-01-26 5e43281d1d7a103c8f211ae5c86df7c89466e13b

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