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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java

@@ -28,6 +28,14 @@
    @TableId("id")
    private Integer id;

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

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

    @ApiModelProperty("站点id")
    @TableField("site_id")
    private Integer siteId;