From 9e8a54035a7b13ef75558c6e44ae7a7cd55693c9 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 07 十二月 2023 08:39:56 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java index ee259d6..de38cb9 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java +++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java @@ -1,9 +1,7 @@ package com.example.springboot.component; import cn.hutool.json.JSONObject; -import cn.hutool.poi.excel.sax.handler.MapRowHandler; - -import java.sql.SQLException; +import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +30,7 @@ //閾濇id public static String FrameNo; //鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠� - public static Boolean isConfirm=true; + public static Boolean isConfirm=false; // public static Map b=new HashMap<>(); // b.put() @Override @@ -89,6 +87,7 @@ // if (inglassInfo.size() > 0) // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70); // } + // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id String queid = spianMapper.Selectqueueid(); int state = spianMapper.Selectqueuestate(); -- Gitblit v1.8.0