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

jyy

2021-01-26 c62ecf74d20a4338632e454c4f270a739d3d69a1

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