Merge branch 'api' into order_reform

Helius

2021-01-06 8eb03554c07de7e268cf230249caf10922c6b47d

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