合并冲突解决

epmet-auth/src/main/java/com/epmet/service/GovWebService.java

@@ -17,6 +17,7 @@ public interface GovWebService {
 	 * @Description PC工作端-工作人员登录
 	 **/
 	UserTokenResultDTO login(GovWebLoginFormDTO formDTO);
+	String generateTokenBySSOKey(String customerId, String userId, String app, String client);
 
 	/**
 	 * 区块链系统通过用户密码认证身份

epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java

@@ -23,6 +23,7 @@ import com.epmet.dto.form.LoginCommonFormDTO;
 import com.epmet.dto.result.GovWebOperLoginResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.service.CaptchaService;
@@ -57,6 +58,8 @@ public class GovWebServiceImpl implements GovWebService, ResultDataResolver {
     private EpmetUserFeignClient epmetUserFeignClient;
     @Autowired
     private ThirdLoginServiceImpl thirdLoginService;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     /**
      * @param formDTO