Merge remote-tracking branch 'origin/master'

mitao

6 天以前 0b7e2752b6f1e87084b837043291c890cca780a8

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

@@ -16,4 +16,17 @@
public interface OaApprovalApplicationsService extends IService<OaApprovalApplications> {

    PageInfo<OaApprovalApplications> pageListAudit(ApprovalTodoListQuery query);

    /**
     * 填充申请记录申请人和申请部门信息
     * @param app
     */
    void assembleApplicationDetail(OaApprovalApplications app);

    /**
     * 生成申请单编号
     * @param prefix
     * @return
     */
    String generateApplicationCode(String prefix);
}