Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 e6fa0149e0c8690efc9c444650c6ef82f04ba54b

 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;
   
}