Merge branch 'master' of https://sinanoaq.cn:8888/r/multi_system

“djh”

5 天以前 5ca4ab349909030e77354832287f2d6a2c80e119

 multi-system/src/main/java/com/gkhy/exam/system/service/CompanyIndustryTemplateService.java

@@ -7,7 +7,7 @@
import com.gkhy.exam.system.domain.CompanyRoster;

public interface CompanyIndustryTemplateService extends IService<CompanyIndustryTemplate> {
    CommonPage selectCompanyIndustryTemplateList(Integer companyId);
    CommonPage selectCompanyIndustryTemplateList(CompanyIndustryTemplate companyId);

    CommonResult insertCompanyIndustryTemplate(CompanyIndustryTemplate companyIndustryTemplate);