Merge branch 'api' into order_reform

Helius

2021-01-12 b8e2c0dee6ae4520a2e0e783b416825d872c8f9e

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