Merge remote-tracking branch 'origin/master'

doum

2026-04-28 28a2f7a48f508970a10413c8aa2367a4e4790b1b

 server/services/src/main/java/com/doumee/dao/vo/ActiveOrderTipVO.java

@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "订单状态")
    private Integer status;

    @ApiModelProperty(value = "订单状态文案")
    private String statusDesc;

    @ApiModelProperty(value = "状态提示文案")
    private String tip;