Merge remote-tracking branch 'origin/master'

xuhy

2025-01-17 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8

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

@@ -59,13 +59,20 @@
    @TableField("pass_status")
    private Integer passStatus;

    @ApiModelProperty(value = "审核时间")
    @TableField("auth_time")
    private LocalDateTime authTime;

    @ApiModelProperty(value = "平台收货时间")
    @TableField("receive_time")
    private LocalDateTime receiveTime;

    @ApiModelProperty(value = "后台审核备注")
    @TableField("pass_remark")
    private String passRemark;

    @ApiModelProperty(value = "删除标志（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;

    @ApiModelProperty(value = "添加时间")
@@ -87,6 +94,16 @@
    @ApiModelProperty("快递单号")
    @TableField("code")
    private String code;


    
    @ApiModelProperty("收货地址JSON")
    @TableField(exist = false)
    private String addressJson;
    
    @ApiModelProperty(value = "第三方快递结果")
    @TableField("express_result")
    private String expressResult;
    
    @ApiModelProperty("最新快递信息")
    @TableField(exist = false)
    private String express;
}