Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

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

@@ -24,7 +24,7 @@ public interface EngineerInfoMPDao extends BaseMapper<EngineerInfo> {
 	@Select("select * from engineer_info where group_id = #{groupId}")
 	@Select("select * from engineer_info where group_id = #{groupId}")
 	List<EngineerInfo> selectByGroupId(String groupId);
 	List<EngineerInfo> selectByGroupId(String groupId);
 
 
-	@Select("<script> select * from engineer_info where groupId in " +
+	@Select("<script> select * from engineer_info where group_id in " +
 			"<foreach item='groupId' collection='groupIds' open='(' separator=',' close=')'>#{groupId}</foreach></script>")
 			"<foreach item='groupId' collection='groupIds' open='(' separator=',' close=')'>#{groupId}</foreach></script>")
 	List<EngineerInfo> selectByGroupIds(@Param("groupIds") List<String> groupIds);
 	List<EngineerInfo> selectByGroupIds(@Param("groupIds") List<String> groupIds);
 }
 }
\ No newline at end of file