Merge branch 'api' into score_shop

Helius

2021-03-01 52958bc0ffa53a616828bd6aeb9e59cf12cafbd3

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