From 1c9744e26645cdb16ba7fc8969dfae0f8906125f Mon Sep 17 00:00:00 2001
From: tuyp <tuyaping@ykhl.com>
Date: Mon, 16 Jun 2025 15:19:18 +0800
Subject: [PATCH] Merge branch 'master' of D:\code\gitbranch with conflicts.

---
 src/main/java/com/subsidy/MeishuApplication.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/subsidy/MeishuApplication.java b/src/main/java/com/subsidy/MeishuApplication.java
index 13650cb..c7ca20e 100644
--- a/src/main/java/com/subsidy/MeishuApplication.java
+++ b/src/main/java/com/subsidy/MeishuApplication.java
@@ -20,7 +20,9 @@ public class MeishuApplication {
     public static void main(String[] args) {
         SpringApplication.run(MeishuApplication.class, args);
         System.out.println("master...........");
-
+        System.out.println("bbbbbbb");
+        System.out.println("测试分支合并");
+        System.out.println(22222222);
     }
 
 
--
libgit2 0.25.0