Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 22d0531ef01ace7a66a0c5cc3e313944fe2ec8b4

 ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java

@@ -17,6 +17,8 @@
    private List<Long> userIds;
    @ApiModelProperty(value = "类型1=我审批的 2=我申请的")
    private String type;
    @ApiModelProperty(value = "类型1=待审批 2=已审批")
    private String auditStatus;
    @ApiModelProperty(value = "当前登陆人id 前端忽略")
    private String userId;
}