From 27f9b73cd5d3e5aa348cd061714ccfcd955efc27 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 19 Aug 2025 12:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=BA=93=E5=AD=98=E5=95=86?=
 =?UTF-8?q?=E5=93=81=EF=BC=8C=E5=8F=A3=E5=91=B3=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsd/pjcloud/supermarket/entity/SmErpTasteStockEntity.java | 0
 .../com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java   | 4 ++--
 .../src/main/resources/mapper/SmErpUnitMapper.xml             | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename pjcloud-supermarket/{pjcloud-supermarket-biz => pjcloud-supermarket-api}/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpTasteStockEntity.java (100%)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpTasteStockEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpTasteStockEntity.java
similarity index 100%
rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpTasteStockEntity.java
rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpTasteStockEntity.java
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java
index 51053bc2a..188cef8d9 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java
@@ -151,7 +151,7 @@ public class SmErpUnitEntity extends Model<SmErpUnitEntity> {
 	private String taste;
 
 
-	@Schema(description = "当前包装单位的库存")
-	private Double stock;
+	@Schema(description = "口味id")
+	private Long tasteId;
 
 }
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml
index a47adbb78..80380fe8f 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml
@@ -23,6 +23,7 @@
         <result property="tenantId" column="tenant_id"/>
         <result property="isBase" column="is_base"/>
         <result property="taste" column="taste"/>
+        <result property="tasteId" column="taste_id"/>
   </resultMap>
 
       <resultMap id="SupermarketUnitWithSpuVoMap" type="com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitWithSpuVo">