From 3b65a5dc04be7cdac460c84ebaa38bf009405128 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 八月 2025 09:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects

---
 玻璃公司项目/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF" "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
index 949d653..5befc17 100644
--- "a/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
+++ "b/\347\216\273\347\222\203\345\205\254\345\217\270\351\241\271\347\233\256/gmms_nglass/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF"
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Built-By: northglass
-Build-Jdk: 1.8.0_31
+Built-By: aaa
+Build-Jdk: 1.8.0_121
 Created-By: Maven Integration for Eclipse
 

--
Gitblit v1.8.0