Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

8 天以前 75ebf501d1a0649c939bbf812fc9984b8f998c3f

 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java

@@ -9,7 +9,6 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;