Merge branch 'master' into test

Helius

2020-12-11 fd4948ce4d936ca72baad4a076a9661f2a4b4fb9

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