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

xuhy

7 天以前 d90ac211d9168c1ce8d390838f367a0db00afb52

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderInfoVO.java

@@ -29,5 +29,7 @@
    private Integer state;
    @ApiModelProperty("预约备注")
    private String reservationRemark;
    @ApiModelProperty("备注")
    private String remark;

}