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

jyy

2021-01-16 3a92361f2181c5d6fcd16536f3a9a80c89d193d6

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