Merge origin/master

Conflicts:
	src/java/com/test/forms/AuthentifForm.java
	web/WEB-INF/PompierJSP.jsp
This commit is contained in:
funcha.ahamadi
2021-10-21 15:16:16 +02:00
parent 0f1e30e12e
commit d4d16b1360
9 changed files with 191 additions and 100 deletions

View File

@@ -5,6 +5,7 @@
--%>
<%@include file = "jspf/enteteJSPF.jspf" %>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html>
<html>
<head>
@@ -48,7 +49,7 @@
<td><c:out value="${unPompier.getAdrCP()}"/></td>
<td><c:out value="${unPompier.getAdrVille()}"/></td>
<td><c:out value="${unPompier.getGrade()}"/></td>
<td><c:out value="${unPompier.getCom()}"/></td>
<td><c:out value="${unPompier.getCommentaire()}"/></td>
</tr>
</c:forEach>