Merge branch 'api' into order_reform

Helius

2021-01-05 6705385361aea5819cadd3efae0735521d22da7b

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