Merge branch 'master' into feat/qiniu-upload

pedro · pedro · commit 49d958534d93 · 2020-03-22T10:35:38.000+08:00
diff --git a/src/main/java/io/github/talelin/merak/common/utils/ResponseUtil.java b/src/main/java/io/github/talelin/merak/common/utils/ResponseUtil.java
@@ -32,9 +32,9 @@ public static <T> UnifyResponseVO<T> generateSuccessResponse(T data) {
                 .build();
     }
 
-    public static <T> UnifyResponseVO<T> generateUnifyResponse(int errorCode) {
+    public static <T> UnifyResponseVO<T> generateUnifyResponse(int code) {
         return (UnifyResponseVO<T>) UnifyResponseVO.builder()
-                .code(errorCode)
+                .code(code)
                 .request(RequestUtil.getSimpleRequest())
                 .build();
     }

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ public static <T> UnifyResponseVO<T> generateSuccessResponse(T data) {`
`32`	`32`	`.build();`
`33`	`33`	`}`
`34`	`34`
`35`		`- public static <T> UnifyResponseVO<T> generateUnifyResponse(int errorCode) {`
	`35`	`+ public static <T> UnifyResponseVO<T> generateUnifyResponse(int code) {`
`36`	`36`	`return (UnifyResponseVO<T>) UnifyResponseVO.builder()`
`37`		`- .code(errorCode)`
	`37`	`+ .code(code)`
`38`	`38`	`.request(RequestUtil.getSimpleRequest())`
`39`	`39`	`.build();`
`40`	`40`	`}`