From 4b4c9344b5e33867cefafe3af2b3a3959eef565a Mon Sep 17 00:00:00 2001
From: wangsiyuan <2392948297@qq.com>
Date: Tue, 5 Sep 2023 17:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Solution.java?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/solution/Solution.java | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/solution/Solution.java b/src/solution/Solution.java
index 1fb6e38..66ccc6b 100644
--- a/src/solution/Solution.java
+++ b/src/solution/Solution.java
@@ -1,9 +1,7 @@
 package solution;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class Solution {
 
@@ -81,8 +79,30 @@ public class Solution {
         }
         return candidate;
     }
-
-    public void merge(int[] nums1, int m, int[] nums2, int n) {
-
+    //合并数组冒泡排序实现
+    public static void merge(int[] nums1, int m, int[] nums2, int n) {
+        int[] nums= new int[m + n];
+        for (int i = 0; i < m + n; i++) {
+            if (i < m){
+                nums[i] = nums1[i];
+            } else {
+                nums[i] = nums2[i - m];
+            }
+        }
+        // 冒泡排序
+        for (int i = 0; i < nums.length; i++) {
+            for (int j = 0; j < nums.length; j++) {
+                if (i != j) {
+                    if (nums[i] < nums[j]){
+                        int temp = nums[i];
+                        nums[i] = nums[j];
+                        nums[j] = temp;
+                    }
+                }
+            }
+        }
+        nums1 = nums;
+        String result = Arrays.stream(nums1).mapToObj(String::valueOf).collect(Collectors.joining(",", "[", "]"));
+        System.out.println(result);
     }
 }