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

jyy

2021-01-26 c3c0a5dc4c3ccc8af4809aa3c789ffe5028377e4

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