From ba975e62723d88d0b60f3fcf7ae31e2b3a6f7569 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 08 八月 2025 14:05:34 +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