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

Helius

2021-01-16 d55a92faa794aaa478edf9f16ee45663f007ac4c

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