Merge branch 'ty_urgent' into test

Helius

2020-12-23 04ce01155d1218e7318afa9eb562cd2691b60539

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