From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java b/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
index b554b43..a71daa2 100644
--- a/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
@@ -1,6 +1,7 @@
package com.java110.utils.util;
+import com.alibaba.fastjson.JSONObject;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.Converter;
@@ -169,6 +170,17 @@
return map;
}
+ /**
+ * bean杞崲涓簃ap瀵硅薄
+ *
+ * @param orgBean 鍘熷bean
+ * @return map瀵硅薄
+ */
+ public static JSONObject beanCovertJson(Object orgBean) {
+
+ return JSONObject.parseObject(JSONObject.toJSONString(orgBean));
+ }
+
/**
* bean闆嗗悎杞崲涓簃ap瀵硅薄闆嗗悎
--
Gitblit v1.8.0