Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml

@@ -58,12 +58,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

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;
 }