Merge branch 'api' into order_reform

Helius

2021-01-08 1cfbbe629377a6147d3415d38be3c0401e586669

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