Merge remote-tracking branch 'origin/dev_dingding' into dev_dingding

# Conflicts:
#	epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

epmet-auth/src/main/java/com/epmet/dto/form/ResiDingAppLoginFormDTO.java

@@ -21,5 +21,8 @@ public class ResiDingAppLoginFormDTO {
      */
     @NotBlank(message = "clientId不能为空")
     private String clientId;
+
+    // @NotBlank(message = "当前访问用户的企业corpId不能为空")
+    // private String corpId;
 }
 

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

@@ -716,6 +716,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
      */
     @Override
     public ResiDingAppLoginResDTO resiLoginDing(ResiDingAppLoginFormDTO formDTO) {
+        //获取用户手机号
+        log.info("钉钉居民端应用登录入参:"+ JSON.toJSONString(formDTO));
+        //todo 调用一下接口
         ResiDingAppLoginResDTO resDTO= null;
         try {
             resDTO = new ResiDingAppLoginResDTO();