Merge branch 'ty_urgent' into test

Helius

2020-12-27 862f4f0942da8033bf49af89eca0055ad8cb4730

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