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

jyy

2021-01-09 58508692587d5d99ae905e8f1e4e4249ffb3b08a

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