Merge remote-tracking branch 'origin/master'

mitao

2025-10-11 18ebe42d5e0b80c39c399090fbb8487559c4b99f

 ruoyi-system/src/main/java/com/ruoyi/system/query/OaApprovalApplicationAssetPageQuery.java

@@ -23,5 +23,8 @@

    @ApiModelProperty("操作类型 前端不传")
    private Integer type; // 0-领用，1-借用，2-归还

    @ApiModelProperty("是否查询归还提醒 前端不传")
    private Integer returnNotify = 0;
}