Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

wzy

2021-11-28 c76890a550f386a52a7111e3d87242ab35af5b41

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