Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java

@@ -153,6 +153,11 @@
    @TableField("cancel_time")
    private Date cancelTime;
    /**
     * 取消方（1=平台，2=商户，3=用户）
     */
    @TableField("cancel_type")
    private Integer cancelType;
    /**
     * 核销用户id
     */
    @TableField("use_user_id")