Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/RefundGoodsDetailPageVO.java

@@ -42,6 +42,11 @@ public class RefundGoodsDetailPageVO {
    private String refundReason;
    @ApiModelProperty("图片")
    private String imgUrl;
+   @ApiModelProperty("已入库数量")
+   private String purNum;
+
+   @ApiModelProperty("货品规格")
+   private String seze;
 
    public Long getRefundDetailId() {
       return refundDetailId;
@@ -111,6 +116,25 @@ public class RefundGoodsDetailPageVO {
       return imgUrl;
    }
 
+
+   public String getSeze() {
+      return seze;
+   }
+
+   public RefundGoodsDetailPageVO setSeze(String seze) {
+      this.seze = seze;
+      return this;
+   }
+
+   public String getPurNum() {
+      return purNum;
+   }
+
+   public RefundGoodsDetailPageVO setPurNum(String purNum) {
+      this.purNum = purNum;
+      return this;
+   }
+
    public RefundGoodsDetailPageVO setRefundDetailId(final Long refundDetailId) {
       this.refundDetailId = refundDetailId;
       return this;

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/RefundGoodsMapper.xml

@@ -227,7 +227,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.refund_num,
         a.total_price,
         a.refund_reason,
-        b.img_url
+        b.img_url,
+        e.pur_num
         FROM
         ims_refund_goods_detail a
         LEFT JOIN cook_material b ON b.material_id = a.material_id