Merge branch 'ty_urgent' into test

wzy

2020-12-20 53c616910a3fd6f2f9669242690c1c85f2ba0a68

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