Merge branch 'ty_urgent' into test

wzy

2020-12-26 b026000678b45d14970bca3b8052e377072f4af2

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