From cf8c3cb608bceb47bc4ea83fb7a9bfe22cb80d2e Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 02 十一月 2024 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DevApp/Gs.DevApp/TestForm/XtraForm1.resx |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/PageBar.resx b/DevApp/Gs.DevApp/TestForm/XtraForm1.resx
similarity index 100%
copy from DevApp/Gs.DevApp/UserControl/PageBar.resx
copy to DevApp/Gs.DevApp/TestForm/XtraForm1.resx

--
Gitblit v1.9.3