提交merge1.3

openhis-server-new/openhis-application/src/main/java/com/openhis/web/departmentmanage/appservice/impl/DepartmentIssuanceOrderServiceImpl.java

@@ -5,7 +5,10 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+<<<<<<< HEAD
 import org.springframework.beans.factory.annotation.Autowired;
+=======
+>>>>>>> v1.3
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -36,17 +39,20 @@ public class DepartmentIssuanceOrderServiceImpl implements IDepartmentIssuanceOr
 
     @Resource
     private AssignSeqUtil assignSeqUtil;
+
     @Resource
     private ISupplyRequestService supplyRequestService;
+
     @Resource
     private ISupplyDeliveryService supplyDeliveryService;
 
-    @Autowired
+    @Resource
     private IDepartmentCommonService departmentCommonService;
 
-    @Autowired
+    @Resource
     private DepartmentCommonMapper departmentCommonMapper;
-    @Autowired
+
+    @Resource
     private DepartmentIssuanceOrderMapper departmentIssuanceOrderMapper;
 
     /**