分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java

对比新文件
@@ -0,0 +1,17 @@
package com.ruoyi.basic.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.Certification;

public interface CertificationService extends IService<Certification> {
    //鏌ヨ璧勮川鏄庣粏鍒楄〃
    IPage<Certification> getCertificationDetail(Page page, Certification certification);

    //娣诲姞璧勮川鏄庣粏鍒楄〃
    int addCertificationDetail(Certification certification);

    //鍒犻櫎璧勮川鏄庣粏鍒楄〃
    int delCertificationDetail(String ids);
}