Merge branch 'developer'

Helius

2022-05-17 e4ff7c372f5c3fe1c9a5fdd88b4d3e265573f7c8

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