From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java |   90 ++++++++++++++++++++++----------------------
 1 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
index 16a252d..8bf40d1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -16,51 +16,51 @@
  */
 public class BeanCopyUtils {
 
-	/**
-	 * 鍗曞璞″熀浜巆lass鍒涘缓鎷疯礉
-	 *
-	 * @param source      鏁版嵁鏉ユ簮瀹炰綋
-	 * @param copyOptions copy鏉′欢
-	 * @param desc        鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
-	 * @return desc
-	 */
-	public static <T, V> V oneCopy(T source, CopyOptions copyOptions, Class<V> desc) {
-		V v = ReflectUtil.newInstanceIfPossible(desc);
-		return oneCopy(source, copyOptions, v);
-	}
+    /**
+     * 鍗曞璞″熀浜巆lass鍒涘缓鎷疯礉
+     *
+     * @param source      鏁版嵁鏉ユ簮瀹炰綋
+     * @param copyOptions copy鏉′欢
+     * @param desc        鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
+     * @return desc
+     */
+    public static <T, V> V oneCopy(T source, CopyOptions copyOptions, Class<V> desc) {
+        V v = ReflectUtil.newInstanceIfPossible(desc);
+        return oneCopy(source, copyOptions, v);
+    }
 
-	/**
-	 * 鍗曞璞″熀浜庡璞″垱寤烘嫹璐�
-	 *
-	 * @param source      鏁版嵁鏉ユ簮瀹炰綋
-	 * @param copyOptions copy鏉′欢
-	 * @param desc        杞崲鍚庣殑瀵硅薄
-	 * @return desc
-	 */
-	public static <T, V> V oneCopy(T source, CopyOptions copyOptions, V desc) {
-		if (ObjectUtil.isNull(source)) {
-			return null;
-		}
-		return BeanCopier.create(source, desc, copyOptions).copy();
-	}
+    /**
+     * 鍗曞璞″熀浜庡璞″垱寤烘嫹璐�
+     *
+     * @param source      鏁版嵁鏉ユ簮瀹炰綋
+     * @param copyOptions copy鏉′欢
+     * @param desc        杞崲鍚庣殑瀵硅薄
+     * @return desc
+     */
+    public static <T, V> V oneCopy(T source, CopyOptions copyOptions, V desc) {
+        if (ObjectUtil.isNull(source)) {
+            return null;
+        }
+        return BeanCopier.create(source, desc, copyOptions).copy();
+    }
 
-	/**
-	 * 鍒楄〃瀵硅薄鍩轰簬class鍒涘缓鎷疯礉
-	 *
-	 * @param sourceList  鏁版嵁鏉ユ簮瀹炰綋鍒楄〃
-	 * @param copyOptions copy鏉′欢
-	 * @param desc        鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
-	 * @return desc
-	 */
-	public static <T, V> List<V> listCopy(List<T> sourceList, CopyOptions copyOptions, Class<V> desc) {
-		if (ObjectUtil.isNull(sourceList)) {
-			return null;
-		}
-		if (CollUtil.isEmpty(sourceList)) {
-			return CollUtil.newArrayList();
-		}
-		return sourceList.stream()
-			.map(source -> oneCopy(source, copyOptions, desc))
-			.collect(Collectors.toList());
-	}
+    /**
+     * 鍒楄〃瀵硅薄鍩轰簬class鍒涘缓鎷疯礉
+     *
+     * @param sourceList  鏁版嵁鏉ユ簮瀹炰綋鍒楄〃
+     * @param copyOptions copy鏉′欢
+     * @param desc        鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
+     * @return desc
+     */
+    public static <T, V> List<V> listCopy(List<T> sourceList, CopyOptions copyOptions, Class<V> desc) {
+        if (ObjectUtil.isNull(sourceList)) {
+            return null;
+        }
+        if (CollUtil.isEmpty(sourceList)) {
+            return CollUtil.newArrayList();
+        }
+        return sourceList.stream()
+                .map(source -> oneCopy(source, copyOptions, desc))
+                .collect(Collectors.toList());
+    }
 }

--
Gitblit v1.9.3