Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-16 de589b98ff007afdcec9d6cef5d1a2b168031b98

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