From 17b3b414203b71d906f979f4678560657ed35f04 Mon Sep 17 00:00:00 2001
From: p2x9nfpei <2196435763@qq.com>
Date: Sun, 27 Apr 2025 21:16:57 +0800
Subject: [PATCH] Update R.java

---
 src/main/java/com/utils/R.java | 55 +---------------------------------
 1 file changed, 1 insertion(+), 54 deletions(-)

diff --git a/src/main/java/com/utils/R.java b/src/main/java/com/utils/R.java
index 80fac85..764667e 100644
--- a/src/main/java/com/utils/R.java
+++ b/src/main/java/com/utils/R.java
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 package com.utils;  // 定义包名为com.utils，表示该类位于com.utils包下
 
 import java.util.HashMap;  // 导入HashMap类，用于实现键值对存储
@@ -91,56 +91,3 @@ public class R extends HashMap<String, Object> {
 		return this;  // 返回当前对象以实现链式调用
 	}
 }
-=======
-package com.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 返回数据
- */
-public class R extends HashMap<String, Object> {
-	private static final long serialVersionUID = 1L;
-	
-	public R() {
-		put("code", 0);
-	}
-	
-	public static R error() {
-		return error(500, "未知异常，请联系管理员");
-	}
-	
-	public static R error(String msg) {
-		return error(500, msg);
-	}
-	
-	public static R error(int code, String msg) {
-		R r = new R();
-		r.put("code", code);
-		r.put("msg", msg);
-		return r;
-	}
-
-	public static R ok(String msg) {
-		R r = new R();
-		r.put("msg", msg);
-		return r;
-	}
-	
-	public static R ok(Map<String, Object> map) {
-		R r = new R();
-		r.putAll(map);
-		return r;
-	}
-	
-	public static R ok() {
-		return new R();
-	}
-
-	public R put(String key, Object value) {
-		super.put(key, value);
-		return this;
-	}
-}
->>>>>>> develop