Merge branch 'feat_Integrate-with-Logistics' of http://47.122.114.111:9999/qinjianhui/factory_front into feat_Integrate-with-Logistics
