Merge remote-tracking branch 'origin/master'

jyy

2020-12-07 65eab9d565f951e3125d6767d0400eb5abcc4d51

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