From 579d2b489f9565f6e506ddbef634d65aa20dc27e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 12 六月 2025 14:03:28 +0800
Subject: [PATCH] 解决合并冲突
---
OAM/Class1.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/OAM/Class1.cs b/OAM/Class1.cs
index 7043bfb..833010f 100644
--- a/OAM/Class1.cs
+++ b/OAM/Class1.cs
@@ -6,5 +6,7 @@
{
public class Class1
{
+
+
}
}
--
Gitblit v1.9.1