Merge branch 'api' into hive2.0

jyy

2021-03-08 aaaf4564b44adf5b9a47843b27fbd68ea56c9a52

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