Merge branch 'ty_urgent' into test

Helius

2020-12-20 4c47534eda0702136016312666b46578bfb6368b

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