修改冲突

8 months ago · 5de23de119
parent 76adecde85
commit 5de23de119
1 changed files with 0 additions and 4 deletions
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java
@ -12,10 +12,6 @@ import jnpf.entity.ContractLEntity;
 import jnpf.model.bom.BomPagination;
 import jnpf.model.businessorder.BusinessOrderPagination;
 import org.apache.ibatis.annotations.Param;
-<<<<<<< HEAD
-=======
-
->>>>>>> 94e0701e0f19edc12472d9efc36500cbf61d113a
 import java.util.List;

 /**