Merge branch 'ty_fix' into alpha

Helius

2021-11-11 404c2fea96204bc0fc4a6845cb13d1992d728aa4

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