Merge remote-tracking branch 'origin/master'

mitao

4 天以前 dfe379f10f5d16a3b34b33f260d3a7ca97c7fdc6

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

@@ -85,4 +85,19 @@
     * @return
     */
    IPage<OaApprovalApplicationAssetPageVO> getReturnNotifyPageList(OaApprovalApplicationAssetPageQuery pageQuery);

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

    /**
     * 删除审批单相关的资产领用/借用/归还记录
     * @param applicationId
     */
    void deleteByApplicationId(Integer applicationId);

    OaApprovalApplicationAsset getOaApprovalApplicationAssetByApplicationId(Integer applicationId);
}