合并代碼

dxhy-erp/src/main/java/com/dxhy/erp/service/BaseIReceiptInvoiceService.java

@@ -1,8 +1,8 @@
 package com.dxhy.erp.service;
 
 
-import com.dxhy.erp.entity.BaseReceiptOutCancelEditReqVO;
 import com.dxhy.erp.entity.BaseTDxRecordInvoice;
+import com.dxhy.erp.model.BaseReceiptOutCancelEditReqVO;
 
 import java.util.List;
 

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/BaseIReceiptInvoiceServiceImpl.java

@@ -11,9 +11,9 @@ import com.dxhy.common.enums.JxszcZtEnum;
 import com.dxhy.common.service.impl.MpBaseServiceImpl;
 import com.dxhy.erp.dao.BaseTDxRecordInvoiceDao;
 import com.dxhy.erp.dao.TdxRecordInvoiceDao;
-import com.dxhy.erp.entity.BaseReceiptOutCancelEditReqVO;
 import com.dxhy.erp.entity.BaseTDxRecordInvoice;
 import com.dxhy.erp.entity.BaseTDxRecordInvoiceOut;
+import com.dxhy.erp.model.BaseReceiptOutCancelEditReqVO;
 import com.dxhy.erp.service.BaseIReceiptInvoiceService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;