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

jyy

2021-03-17 301d10c88b03bc7993c64c3467b1bcb0b48104ea

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