From fbd31387721424c65b173cbb23b03202f3e7dce6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 五月 2025 21:13:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
index 3ceee1b..8cba008 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
@@ -26,7 +26,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -65,25 +64,25 @@
     @Resource
     DamageService damageService;
 
-    @Value("${mes.glassGap}")
+//    @Value("${mes.glassGap}")
     private int glassGap;
-    @Value("${mes.threshold}")
+    //    @Value("${mes.threshold}")
     private int threshold;
-    @Value("${mes.cellLength}")
+    //    @Value("${mes.cellLength}")
     private int cellLength;
-    @Value("${mes.ratio}")
+    //    @Value("${mes.ratio}")
     private int ratio;
 
-    @Value("${mes.min.one.firstLength}")
+    //    @Value("${mes.min.one.firstLength}")
     private int minOneFirstLength;
 
-    @Value("${mes.min.one.secondLength}")
+    //    @Value("${mes.min.one.secondLength}")
     private int minOneSecondLength;
 
-    @Value("${mes.min.two.firstLength}")
+    //    @Value("${mes.min.two.firstLength}")
     private int minTwoFirstLength;
 
-    @Value("${mes.min.two.secondLength}")
+    //    @Value("${mes.min.two.secondLength}")
     private int minTwoSecondLength;
 
     private String glassInIdOne = "";

--
Gitblit v1.8.0