From 72ecfe19354d60990edd9f28cb3f54739c0d396b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 26 七月 2023 16:04:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES

---
 gmms/.settings/org.eclipse.core.resources.prefs |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gmms/.settings/org.eclipse.core.resources.prefs b/gmms/.settings/org.eclipse.core.resources.prefs
index 5824ff9..f833d73 100644
--- a/gmms/.settings/org.eclipse.core.resources.prefs
+++ b/gmms/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
+encoding//WebContent/dapingxianshi/dakongdaping.jsp=UTF-8
 encoding//WebContent/login/machinelistcontent.jsp=UTF-8

--
Gitblit v1.8.0