Merge branch 'master' of https://gitee.com/jyyforjava/zq-erp

wzy

2020-12-14 d151ab96d31e8c581f71e9185d895d1a589e829c

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