Merge remote-tracking branch 'origin/master'

xuhy

2024-09-10 dcff8ae4cd446921c85cc956a7e27bb715c3c582

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

@@ -180,5 +180,8 @@
    @ApiModelProperty(value = "取消人")
    @TableField(exist = false)
    private String cancellationName;
    @ApiModelProperty(value = "订单id")
    @TableField(exist = false)
    private String uid;

}