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

935090232@qq.com

2021-01-16 79553cb3db14cb9b86fbb0d6aa767b16c786d2fb

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