Merge remote-tracking branch 'remotes/origin/dev_pyscreen' into dev_temp

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

@@ -159,10 +159,10 @@ public class SsoServiceImpl implements SsoService {
         form.setMobile(thirdUser.getMobile());
         Result<GovWebOperLoginResultDTO> result = epmetUserFeignClient.getStaffIdAndPwd(form);
         //todo userId 写死测试 3f7f852ce22c511aa67ecb695395295d start
-        GovWebOperLoginResultDTO demo = new GovWebOperLoginResultDTO();
+       /* GovWebOperLoginResultDTO demo = new GovWebOperLoginResultDTO();
         demo.setUserId("3f7f852ce22c511aa67ecb695395295d");
         result = new Result<>();
-        result.ok(demo);
+        result.ok(demo);*/
         //test end
 
         if (!result.success() || null == result.getData() || null == result.getData().getUserId()) {