diff --git a/src/main/java/com/zteits/oa/api/dto/asraop/param/AsraOpQueryReq.java b/src/main/java/com/zteits/oa/api/dto/asraop/param/AsraOpQueryReq.java
index 63f0e96..95fca6d 100644
--- a/src/main/java/com/zteits/oa/api/dto/asraop/param/AsraOpQueryReq.java
+++ b/src/main/java/com/zteits/oa/api/dto/asraop/param/AsraOpQueryReq.java
@@ -11,14 +11,10 @@ public class AsraOpQueryReq extends BaseRequest{
 	 */
 	private static final long serialVersionUID = 7249746348000980054L;
 
-<<<<<<< Updated upstream
 	/**主键*/
     private Long id;
     
-	/**登录工号*/
-=======
 	/**当前登录人的登录工号*/
->>>>>>> Stashed changes
     private String loginCode;
     
     /**登录密码*/
diff --git a/src/main/java/com/zteits/oa/api/service/report/query/AsraOpQueryService.java b/src/main/java/com/zteits/oa/api/service/report/query/AsraOpQueryService.java
index 5eb4ff0..f568f74 100644
--- a/src/main/java/com/zteits/oa/api/service/report/query/AsraOpQueryService.java
+++ b/src/main/java/com/zteits/oa/api/service/report/query/AsraOpQueryService.java
@@ -32,7 +32,6 @@ public interface AsraOpQueryService {
 	 * 2018年7月30日  wangfs.<br/>
 	 */
 	BizResult<PageBean<AsraOpDTO>>  queryAsraOpForPage(AsraOpQueryReq asraOpQueryReq);
-<<<<<<< Updated upstream:src/main/java/com/zteits/oa/api/service/report/query/AsraOpRueryService.java
 	/**
 	 * 获取员工信息.<br/>
 	 * @param asraOpQueryRe
@@ -41,7 +40,6 @@ public interface AsraOpQueryService {
 	 */
 	BizResult<AsraOpDTO> queryAsraOp(AsraOpQueryReq asraOpQueryRe);
 	
-=======
 
 	/**
 	 * 根据登录工号查询员工信息
@@ -52,5 +50,4 @@ public interface AsraOpQueryService {
 	 *
 	 */
 	BizResult<AsraOpDTO> queryAsraOpByLoginCode(AsraOpQueryReq asraOpQueryReq);
->>>>>>> Stashed changes:src/main/java/com/zteits/oa/api/service/report/query/AsraOpQueryService.java
 }
diff --git a/src/main/java/com/zteits/oa/report/dao/AsraOpDao.java b/src/main/java/com/zteits/oa/report/dao/AsraOpDao.java
index 2445294..d35da7c 100644
--- a/src/main/java/com/zteits/oa/report/dao/AsraOpDao.java
+++ b/src/main/java/com/zteits/oa/report/dao/AsraOpDao.java
@@ -15,8 +15,7 @@ public interface AsraOpDao {
 	 * 2018年7月30日  wangfs.<br/>
 	 */
 	PageInfo<AsraOp> queryAsraOpForPage(AsraOpQueryReq asraOpQueryReq);
-<<<<<<< Updated upstream
-	
+
 	/**
 	 * 获取员工信息.<br/>
 	 * @param asraOpQueryRe
@@ -24,7 +23,6 @@ public interface AsraOpDao {
 	 * 2018年7月31日  wangfs.<br/>
 	 */
 	AsraOp queryAsraOp(AsraOpQueryReq asraOpQueryRe);
-=======
 
 	/**
 	 * 根据登录工号查询员工信息
@@ -35,5 +33,4 @@ public interface AsraOpDao {
 	 *
 	 */
 	AsraOp queryAsraOpByLoginCode(String loginCode);
->>>>>>> Stashed changes
 }
diff --git a/src/main/java/com/zteits/oa/report/dao/impl/AsraOpDaoImpl.java b/src/main/java/com/zteits/oa/report/dao/impl/AsraOpDaoImpl.java
index f6e49a9..19b5b35 100644
--- a/src/main/java/com/zteits/oa/report/dao/impl/AsraOpDaoImpl.java
+++ b/src/main/java/com/zteits/oa/report/dao/impl/AsraOpDaoImpl.java
@@ -23,11 +23,7 @@ public class AsraOpDaoImpl implements AsraOpDao {
 
 	@Autowired
 	private AsraOpSmapper asraOpSmapper;
-<<<<<<< Updated upstream
-	
-=======
 
->>>>>>> Stashed changes
 	@Autowired
 	private AsraOpMapper asraOpMapper;
 	/**
diff --git a/src/main/java/com/zteits/oa/report/web/OAuthController.java b/src/main/java/com/zteits/oa/report/web/OAuthController.java
index 633a374..5a313a5 100644
--- a/src/main/java/com/zteits/oa/report/web/OAuthController.java
+++ b/src/main/java/com/zteits/oa/report/web/OAuthController.java
@@ -3,6 +3,7 @@ package com.zteits.oa.report.web;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import com.zteits.oa.api.service.report.query.AsraOpQueryService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +20,6 @@ import com.zteits.oa.api.dto.asraop.AsraOpDTO;
 import com.zteits.oa.api.dto.asraop.LoginOathRes;
 import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
 import com.zteits.oa.api.dto.asraop.param.LoginOauthReq;
-import com.zteits.oa.api.service.report.query.AsraOpRueryService;
 import com.zteits.oa.util.MD5Utils;
 
 import io.swagger.annotations.Api;
@@ -32,7 +32,7 @@ public class OAuthController {
 	 private static final Logger logger = LoggerFactory.getLogger(OAuthController.class);
 	 
 	 @Autowired
-	 private AsraOpRueryService asraOpRueryService;
+	 private AsraOpQueryService asraOpQueryService;
 	 
 	 @Autowired
 	 private HttpServletRequest request;
@@ -63,7 +63,7 @@ public class OAuthController {
 		 boolean isCheckSuccess = false;
 		 //1.判断登录账号/密码
 		 asraOpQueryRe.setLoginCode(loginCode);
-		 BizResult<AsraOpDTO> asraOpReult = asraOpRueryService.queryAsraOp(asraOpQueryRe);
+		 BizResult<AsraOpDTO> asraOpReult = asraOpQueryService.queryAsraOp(asraOpQueryRe);
 		 if(asraOpReult != null && asraOpReult.getData() != null){
 			 asraOpDTO = asraOpReult.getData();
 			 if(StringUtils.isEmpty(asraOpDTO.getLoginCode())){