uap35-d/SDIS4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	src/java/bdd/PompierMySql.java
	src/java/com/test/servlets/authentifServlet.java
	web/WEB-INF/CreaPompier.jsp
This commit is contained in:
funcha.ahamadi
2021-10-21 16:49:56 +02:00
parent 604d82a412
commit 585b08ff8f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/bdd/PompierMySql.java
View File

@@ -62,10 +62,10 @@ public class PompierMySql {
resultQ.getString("adresse"), resultQ.getString("adresse"),
resultQ.getString("cp"), resultQ.getString("cp"),
resultQ.getString("ville"), resultQ.getString("ville"),
resultQ.getString("bip"), resultQ.getInt("bip"),
resultQ.getInt("nbGardes"), resultQ.getInt("nbGardes"),
resultQ.getInt("grade"), resultQ.getInt("grade"),
resultQ.getString("commentaire") resultQ.getString("commentaire"),
resultQ.getInt("idEmployeur") resultQ.getInt("idEmployeur")
); );
lesPompiers.add(unPompier); lesPompiers.add(unPompier);
@@ -155,11 +155,11 @@ public class PompierMySql {
resultQ.getString("adresse"), resultQ.getString("adresse"),
resultQ.getString("cp"), resultQ.getString("cp"),
resultQ.getString("ville"), resultQ.getString("ville"),
resultQ.getString("bip"), resultQ.getInt("bip"),
resultQ.getInt("nbGardes"), resultQ.getInt("nbGardes"),
resultQ.getInt("grade"), resultQ.getInt("grade"),
resultQ.getString("commentaire"), resultQ.getString("commentaire"),
resultQ.getInt("idEmployeur"), resultQ.getInt("idEmployeur")
); );