From 585b08ff8f1dfc6390dcf32b7af5d653263dfcb2 Mon Sep 17 00:00:00 2001 From: "funcha.ahamadi" Date: Thu, 21 Oct 2021 16:49:56 +0200 Subject: [PATCH] Merge origin/master Conflicts: src/java/bdd/PompierMySql.java src/java/com/test/servlets/authentifServlet.java web/WEB-INF/CreaPompier.jsp --- src/java/bdd/PompierMySql.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/bdd/PompierMySql.java b/src/java/bdd/PompierMySql.java index 3a60702..bb7217d 100644 --- a/src/java/bdd/PompierMySql.java +++ b/src/java/bdd/PompierMySql.java @@ -62,10 +62,10 @@ public class PompierMySql { resultQ.getString("adresse"), resultQ.getString("cp"), resultQ.getString("ville"), - resultQ.getString("bip"), + resultQ.getInt("bip"), resultQ.getInt("nbGardes"), resultQ.getInt("grade"), - resultQ.getString("commentaire") + resultQ.getString("commentaire"), resultQ.getInt("idEmployeur") ); lesPompiers.add(unPompier); @@ -155,11 +155,11 @@ public class PompierMySql { resultQ.getString("adresse"), resultQ.getString("cp"), resultQ.getString("ville"), - resultQ.getString("bip"), + resultQ.getInt("bip"), resultQ.getInt("nbGardes"), resultQ.getInt("grade"), resultQ.getString("commentaire"), - resultQ.getInt("idEmployeur"), + resultQ.getInt("idEmployeur") );