Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-13 ad60d3e63bbfe66abc4a4857099baeb1b668ff96

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

@@ -143,6 +143,10 @@
    @TableField("express_json")
    private String expressJson;

    @ApiModelProperty(value = "第三方快递结果")
    @TableField("express_result")
    private String expressResult;

    @ApiModelProperty(value = "收货地址信息")
    @TableField("address_json")
    private String addressJson;