红德堂-积分商品列表返回库存

fs-service/src/main/java/com/fs/his/mapper/FsIntegralGoodsMapper.java

@@ -80,7 +80,7 @@ public interface FsIntegralGoodsMapper
             "</script>"})
     List<FsIntegralGoodsListVO> selectFsIntegralGoodsListVO(FsIntegralGoods fsIntegralGoods);
     @Select({"<script> " +
-            "select g.goods_id,g.img_url,g.images,g.goods_name,g.ot_price,g.goods_type,g.integral,g.cash,g.sort  from fs_integral_goods g  " +
+            "select g.goods_id,g.img_url,g.images,g.goods_name,g.ot_price,g.goods_type,g.integral,g.cash,g.sort,g.stock  from fs_integral_goods g  " +
             "where g.status=1  " +
             "<if test = 'maps.goodsType != null and maps.goodsType != 0     '> " +
             "and g.goods_type = #{maps.goodsType}  " +

fs-service/src/main/java/com/fs/his/vo/FsIntegralGoodsListUVO.java

@@ -30,8 +30,6 @@ public class FsIntegralGoodsListUVO implements Serializable {
     /** 商品分类 */
     private Long goodsType;
 
-
-
     /** 所需积分 */
     private Long integral;
 
@@ -41,6 +39,8 @@ public class FsIntegralGoodsListUVO implements Serializable {
     /** 排序 */
     private Long sort;
 
+    /** 库存 **/
+    private Integer stock;