Merge branch 'api' into hive2.0

jyy

2021-01-28 5dee07d9b58619142e18e1182db521ebaab15409

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