Merge branch 'api' into score_shop

jyy

2021-03-10 df6a117d2923400fef1ed14cd60d14f56f4a6eec

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