From 3219ee5eb2c7de1e1401bd94cb4dc4d37195b244 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 四月 2022 11:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
java110-bean/src/main/java/com/java110/vo/ResultVo.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/vo/ResultVo.java b/java110-bean/src/main/java/com/java110/vo/ResultVo.java
index 3d1fda8..8eb7044 100755
--- a/java110-bean/src/main/java/com/java110/vo/ResultVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/ResultVo.java
@@ -44,6 +44,8 @@
public static final int CODE_WAIT_PAY = 41;// 鏀粯鏈畬鎴�
+ public static final String EMPTY_ARRAY = "[]";
+
// 鍒嗛〉椤垫暟
private int page;
// 琛屾暟
@@ -250,6 +252,17 @@
*
* @return
*/
+ public static ResponseEntity<String> error(String msg,HttpStatus status) {
+ ResultVo resultVo = new ResultVo(CODE_ERROR, msg);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), status);
+ return responseEntity;
+ }
+
+ /**
+ * 鎴愬姛閫氱敤鍥炲
+ *
+ * @return
+ */
public static ResponseEntity<String> error(String msg) {
ResultVo resultVo = new ResultVo(CODE_ERROR, msg);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
--
Gitblit v1.8.0