Merge remote-tracking branch 'origin/master'

xuhy

2025-01-17 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8

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

@@ -143,6 +143,10 @@
    @TableField("express_pay_method")
    private Integer expressPayMethod;

    @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
    @TableField("distribution_mode")
    private Integer distributionMode;

    @ApiModelProperty(value = "第三方快递信息")
    @TableField("express_json")
    private String expressJson;