From 60f83a79cf2be350b92f4fc2df00b8cb59d238ce Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 26 Jul 2024 10:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E3=80=81=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml |  7 +++----
 .../yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java  | 10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
index cbcb659..6136776 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
@@ -48,12 +48,11 @@
         a.barCode,
         s.own_spec AS goodsSkuOwnSpec,
         a.goodsUnitName as unit,
-        '1' as count,
-        '1' as count1,
-        '1' as pcsNum,
         e.tagPrice,
         e.salesPrice as cost,
-        e.salesPrice as cost1
+        e.salesPrice as cost1,
+        a.shelfLife,
+        a.taxRate
         FROM
         goods_sku s
         LEFT JOIN goods_spu a
diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java
index 8b05412..e393a21 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectList.java
@@ -24,16 +24,14 @@ public class GoodsSkuPurSelectList {
     private String goodsSkuOwnSpec;
     //单位
     private String unit;
-    //数量
-    private BigDecimal count;
-    //数量1
-    private BigDecimal count1;
-    //数量
-    private BigDecimal pcsNum;
     //吊牌价
     private BigDecimal tagPrice;
     //单价
     private BigDecimal cost;
     //单价1
     private BigDecimal cost1;
+    //保质期
+    private String shelfLife;
+    //税率
+    private BigDecimal taxRate;
 }