Merge branch 'dev_mp2jpa' into 'develop'

修改

See merge request !315

project-order/src/main/java/com/dituhui/pea/order/dao/EngineerSkillGroupDao.java

@@ -2,16 +2,14 @@ package com.dituhui.pea.order.dao;
 
 
 import com.dituhui.pea.order.entity.EngineerSkillGroupEntity;
 import com.dituhui.pea.order.entity.EngineerSkillGroupEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 import java.util.List;
 import java.util.List;
 
 
-@Repository
 public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
 public interface EngineerSkillGroupDao extends JpaRepository<EngineerSkillGroupEntity, Integer> {
 	List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
 	List<EngineerSkillGroupEntity> findByEngineerCode(String engineerCode);
 	List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, Integer status);
 	List<EngineerSkillGroupEntity> findByEngineerCodeAndStatus(String engineerCode, Integer status);
 	List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatus(List<String> engineerCodes, Integer status);
 	List<EngineerSkillGroupEntity> findByEngineerCodeInAndStatus(List<String> engineerCodes, Integer status);
 	List<EngineerSkillGroupEntity> findBySkillGroupCode(String skillGroupCode);
 	List<EngineerSkillGroupEntity> findBySkillGroupCode(String skillGroupCode);
-	List<EngineerSkillGroupEntity> findBySkillGroupCodeAnd(String skillGroupCode, Integer status);
+	List<EngineerSkillGroupEntity> findBySkillGroupCodeAndStatus(String skillGroupCode, Integer status);
 }
 }