Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-15 96d936331f7840b8157b64ad8bb9cbace99c1557

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java

@@ -71,5 +71,7 @@
   private String afterSaleTime;
   @ApiModelProperty("活动名称")
   private String activityName;
   @ApiModelProperty("核销码BASE64")
   private String writeOffCode;
   
}