Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java

ms-biz/src/main/java/com/ms/api/common/Ret.java

@@ -1,8 +1,11 @@
 package com.ms.api.common;
 
-import lombok.Data;
+import java.util.Date;
-
 import java.util.Map;
+import java.util.Set;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.Data;
 
 /**
  * 方法处理结果
@@ -38,6 +41,11 @@ public class Ret {
     }
 
     public static Ret success(Map data) {
+        for (Object key : data.keySet()) {
+            if (data.get(key) instanceof  Date){
+                data.put(key,DateUtil.formatDateTime((Date) data.get(key)));
+            }
+        }
         return new Ret("success", data);
     }
 
@@ -52,10 +60,10 @@ public class Ret {
     @Override
     public String toString() {
         return "Ret{" +
-                "result='" + result + '\'' +
+            "result='" + result + '\'' +
-                ", reason='" + reason + '\'' +
+            ", reason='" + reason + '\'' +
-                ", code='" + code + '\'' +
+            ", code='" + code + '\'' +
-                ", data=" + data +
+            ", data=" + data +
-                '}';
+            '}';
     }
 }