Merge remote-tracking branch 'origin/master'

4dkankan-common-utils/src/main/java/com/fdkankan/common/response/ResultData.java

@@ -1,6 +1,7 @@
 package com.fdkankan.common.response;
 
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.ServerCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -40,7 +41,7 @@ public class ResultData<T> implements Serializable {
         return ok("成功", data);
     }
     public static ResultData ok(String msg, Object data) {
-        return base(0, msg, data,true);
+        return base(ServerCode.SUCCESS.code(), msg, data,true);
     }
 
     public static ResultData ok(int page,int pageSize,int total,Object data){