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

无关风月

2025-06-25 3044a637a15e09d50ad733fd482c6e64e90df2f9

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/UserOrderRequest.java

@@ -16,6 +16,9 @@
@ApiModel(value = "OrderRequest对象", description = "用户下单请求参数对象")
public class UserOrderRequest {

    @ApiModelProperty("下单城市")
    private String city;

    @ApiModelProperty("订单编号")
    private String orderNumber;