Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-19 236fe234fac0fb33b1caa24ed80d74d47a2cc68e

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