Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderDetailDto.java

@@ -59,4 +59,7 @@ public class TbOrderDetailDto implements Serializable {
 
     /** 打包费 */
     private BigDecimal packAmount;
+
+    private Integer isVip;
+
 }

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

@@ -103,6 +103,10 @@ public class TbOrderDetail implements Serializable {
     @ApiModelProperty(value = "退单数量")
     private Integer refundNumber;
 
+    @Column(name = "`is_vip`")
+    @ApiModelProperty(value = "isVip")
+    private Integer isVip;
+
     public void copy(TbOrderDetail source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }