From 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 15 八月 2024 20:13:38 +0800
Subject: [PATCH] 测试git提交冲突问题
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
index 7a7aea9..9b94cb4 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/LogCtrl.java
@@ -26,7 +26,7 @@
}
/**
- * 鏍规嵁id鏌ヨ鏃ュ織
+ * 鏍规嵁id鏌ヨ鏃ュ織娴嬭瘯git鎻愪氦鍐茬獊闂
* @return
*/
@GetMapping(path = "one")
--
Gitblit v1.8.0