Merge branch 'api' into test

jyy

2021-03-08 0a426c08ac419c558334d89ab79fbbef4e7e3af8

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