Merge remote-tracking branch 'origin/master'

xuhy

2025-01-16 9fde9f917552f659d41fcfce5094f429a29b8ead

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