Merge remote-tracking branch 'origin/master'

无关风月

20 小时以前 3de2d31db9ac65c354fd228ab84fa2ed786482b9

 ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java

@@ -87,6 +87,13 @@
    IPage<OaApprovalApplicationAssetPageVO> getReturnNotifyPageList(OaApprovalApplicationAssetPageQuery pageQuery);

    /**
     * 获取归还单详情
     * @param id
     * @return
     */
    OaApprovalApplicationAssetDetailVO getReturnDetail(Integer id);

    /**
     * 删除审批单相关的资产领用/借用/归还记录
     * @param applicationId
     */