Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-09 6b12805b53f7a6d131b5cffcf45e3b3c68336568

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java

@@ -30,6 +30,8 @@

    @TableId("id")
    private Long id;
    @TableField(exist = false)
    private String idStr;

    @ApiModelProperty(value = "订单id")
    @TableField("order_id")