From 63dd8bdd72afc4e8277606932999e598a13dd04e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 08 八月 2025 10:09:59 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

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

diff --git a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.resx b/DevApp/Gs.DevApp/XtraForm1.resx
similarity index 100%
copy from DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.resx
copy to DevApp/Gs.DevApp/XtraForm1.resx

--
Gitblit v1.9.3