Merge remote-tracking branch 'origin/master'

yami-shop-api/src/main/java/com/yami/shop/api/controller/RefundDeliveryController.java

@@ -41,7 +41,7 @@ public class RefundDeliveryController {
      */
     @GetMapping("/getByRefundSn/{refundSn}")
     @ApiOperation("根据退款编号获取退货物流信息")
-    public ResponseEntity<RefundDelivery> getByRefundSn(@PathVariable String refundSn) {
+    public ResponseEntity<RefundDelivery> getByRefundSn(@PathVariable("refundSn") String refundSn) {
         RefundDelivery refundDelivery = refundDeliveryService.getOne(new LambdaQueryWrapper<RefundDelivery>().eq(RefundDelivery::getRefundSn, refundSn));
         return ResponseEntity.ok(refundDelivery);
     }

yami-shop-bean/src/main/java/com/yami/shop/bean/model/RefundDelivery.java

@@ -2,6 +2,8 @@ package com.yami.shop.bean.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -9,6 +11,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
+@ApiModel("退款信息")
 @TableName("tz_refund_delivery")
 public class RefundDelivery implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -22,30 +25,35 @@ public class RefundDelivery implements Serializable {
      * 店铺id
      */
     @NotNull(message = "店铺id不能为空")
+    @ApiModelProperty(value = "店铺id", required = true)
     private Long shopId;
     /**
      * 用户id
      */
     @NotNull(message = "用户id不能为空")
+    @ApiModelProperty(value = "用户id", required = true)
     private String userId;
     /**
      * 退款编号
      */
     @NotNull(message = "退款编号不能为空")
+    @ApiModelProperty(value = "退款编号", required = true)
     private String refundSn;
     /**
      * 物流公司id
      */
     @NotNull(message = "物流公司id不能为空")
+    @ApiModelProperty(value = "物流公司id", required = true)
     private Long deyId;
     /**
      * 物流公司名称
      */
+    @ApiModelProperty(value = "物流公司名称", required = true)
     private String deyName;
     /**
      * 物流编号
      */
-    @NotNull(message = "物流编号不能为空")
+    @NotNull(message = "物流编号")
     private String deyNu;
     /**
      * 收件人姓名