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

jyy

2021-01-28 83571cf68bc955b8b804d3402331d1ba7f2f4e6c

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