Merge branch 'api' into hive2.0

jyy

2021-01-26 68434f8f14a02ca70317e9cc2709c0713ef7d1e3

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