Merge branch 'api' into order_reform

Helius

2021-01-12 5cb9253ec5ca86587a154226998ccc4eae3a14fd

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