Merge remote-tracking branch 'origin/master'

doum

2 天以前 4ab710d8d70017f090dd9601099ded1a50a58a10

 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;