Merge branch 'api' into hive2.0

jyy

2021-03-08 acc6c0773bc959be6aa8cf6b9e767593a2d066f4

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