Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-15 19fb7fa1fdbcee7cecfee1554610bb40f40e2976

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