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

jyy

2021-01-16 522f32b832e47a1e0cb01b0b495d16ada34366a6

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