Merge remote-tracking branch 'origin/dev' into share-stock

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java

@@ -99,6 +99,10 @@ public class TbOrderDetail implements Serializable {
     @ApiModelProperty(value = "打包费")
     private BigDecimal packAmount;
 
+    @Transient
+    @ApiModelProperty(value = "退单数量")
+    private Integer refundNumber;
+
     public void copy(TbOrderDetail source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }