Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-20 49f2eff2cf52e0f1719dfad43cafff11b378252c

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

@@ -51,7 +51,7 @@
   @ApiModelProperty("审核状态（1待审核2同意3拒绝）")
   private Integer passStatus;
   @ApiModelProperty("审核注释")
   private Integer passRemark;
   private String passRemark;
   @ApiModelProperty("售后申请时间")
   private String passCreateTime;
   @ApiModelProperty("售后类型（1退货退款2仅退款）")