Merge remote-tracking branch 'origin/master'

xuhy

2024-10-31 b58c937b5ec096b3d92e1100ce3e6c3edf5705fe

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

@@ -31,6 +31,9 @@
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "地址json")
    @TableField("address_json")
    private String addressJson;
    @ApiModelProperty(value = "订单编号")
    @TableField("code")
    private String code;