Merge branch 'developer' into alpha

姜友瑶

2022-05-05 c41e8d372cdabbe1fd5973c9322e38a40bfa1a39

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