Merge branch 'api' into order_reform

wzy

2021-01-13 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994

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