From 1ca82dadcc27e539104299244f50c4dd860655d7 Mon Sep 17 00:00:00 2001
From: shusir <497819738@qq.com>
Date: Tue, 31 Mar 2026 17:58:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=B4=E6=97=B6=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=BA=B6=E6=B6=B2=E7=9A=84=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zt/plat/module/qms/core/util/qrcode/QrCodeJsonUtil.java | 1 -
 .../material/dal/dataobject/MaterialStandardSolutionDO.java     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/util/qrcode/QrCodeJsonUtil.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/util/qrcode/QrCodeJsonUtil.java
index c79f2278..c0ba33f7 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/util/qrcode/QrCodeJsonUtil.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/util/qrcode/QrCodeJsonUtil.java
@@ -2,7 +2,6 @@ package com.zt.plat.module.qms.core.util.qrcode;
 
 import cn.hutool.core.lang.func.Func1;
 import cn.hutool.core.lang.func.LambdaUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.zt.plat.framework.common.exception.ServiceException;
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialStandardSolutionDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialStandardSolutionDO.java
index 2abffbd5..fdd1c0f3 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialStandardSolutionDO.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialStandardSolutionDO.java
@@ -103,7 +103,7 @@ public class MaterialStandardSolutionDO extends BusinessBaseDO {
     /**
     * 标定状态
     */
-    @TableField("STD_FLW")
+    @TableField("CLB_STS")
     private String standardFlow;
     /**
     * 所属部门