Merge branch 'hive2.0' of https://gitee.com/jyyforjava/zq-erp into hive2.0

Helius

2020-12-09 74ca49871c6edbd47c2014de126fee0d6971f760

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