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

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -20,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.ui.ModelMap;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.bind.annotation.*;
 
@@ -211,9 +210,10 @@ public class AdamUserController {
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "个人信息")
     @PostMapping(value = {"info"})
-    public ResponseDto info(ModelMap map) {
+    public ResponseDto<Map<String, Object>> info() {
         String currentUid = CurrentUtil.getCurrentUid();
 
+        Map<String, Object> map = new HashMap<>();
         map.put("userInfo", adamRdmService.getUserInfoVoByUid(currentUid));
         map.put("realNameInfo", adamRdmService.getRealInfoVoByUid(currentUid));
         map.put("thirdPartInfo", adamRdmService.getThirdPartVoListByUid(currentUid));