From 06167c16ee2b47f90d517105470763cbefb35b24 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 20 Jun 2025 13:42:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java | 2 +-
 .../src/main/resources/mapper/SmErpStockMapper.xml            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java
index fa5a659eb..a8cd0bb03 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/stockwarn/StockWarnVO.java
@@ -34,7 +34,7 @@ public class StockWarnVO {
      * 自编码/条码
      */
     @Schema(description="自编码/条码")
-    private String barcode;
+    private String barCode;
 
     /**
      * 商品名称
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpStockMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpStockMapper.xml
index 09f78fdbb..5a41639f5 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpStockMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpStockMapper.xml
@@ -40,7 +40,7 @@
             stock.current_stock as stock,
             spu.product_code,
             spu.product_name,
-            spu.barcode,
+            spu.bar_code,
             spu.spec,
             spu.unit,
             spu.package_num,
@@ -61,7 +61,7 @@
                         AND spu.product_code = #{param.productCode}
                   </if>
                   <if test="param.barcode != null and param.barcode != ''">
-                        AND spu.barcode = #{param.barcode}
+                        AND spu.bar_code = #{param.barCode}
                   </if>
                   <if test="param.productName != null and param.productName != ''">
                         AND spu.product_name LIKE CONCAT('%', #{param.productName}, '%')