From 986de1ea52ea40a848a8e8ffe478122850bb03a2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 09:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/说明.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/\350\257\264\346\230\216.txt" "b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/\350\257\264\346\230\216.txt"
index ec28812..77ccb31 100644
--- "a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/\350\257\264\346\230\216.txt"
+++ "b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/\350\257\264\346\230\216.txt"
@@ -1 +1 @@
-椤圭洰绾у叏灞�Controller
\ No newline at end of file
+椤圭洰绾у叏灞�Controller锛屾墍鏈変緷璧杙ms-global鐨勬ā鍧楅兘鏈夎繖浜涘叏灞�鐨凜ontroller
\ No newline at end of file

--
Gitblit v1.8.0