Merge branch 'api' into hive2.0

jyy

2021-03-08 09236e832a65ab4f99e4ca6ecb3ab6022c86ea37

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