from hedi

This commit is contained in:
Hedi 2021-12-13 14:33:19 +01:00
parent 56b9fbadb3
commit c12222a047
6 changed files with 2 additions and 15 deletions

4
.idea/compiler.xml generated
View File

@ -6,12 +6,8 @@
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="organizee" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel>
<module name="organizee" target="11" />
</bytecodeTargetLevel>
</component> </component>
<component name="JavacSettings"> <component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE"> <option name="ADDITIONAL_OPTIONS_OVERRIDE">

4
.idea/misc.xml generated
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<<<<<<< HEAD
<component name="ProjectRootManager">
=======
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">
@ -12,7 +9,6 @@
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

4
.idea/vcs.xml generated
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<<<<<<< HEAD
<mapping directory="" vcs="Git" />
=======
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
</component> </component>
</project> </project>

View File

@ -51,4 +51,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -3,6 +3,7 @@ package fr.organizee.model;
import javax.persistence.*; import javax.persistence.*;
import java.time.LocalDate; import java.time.LocalDate;
@Entity @Entity
public class Membre { public class Membre {
@Id @Id
@ -14,7 +15,6 @@ public class Membre {
private String email; private String email;
private String password; private String password;
private String isAdmin; private String isAdmin;
private String testGit;
@ManyToOne(fetch= FetchType.EAGER) @ManyToOne(fetch= FetchType.EAGER)
@JoinColumn(name="TEAM_ID") @JoinColumn(name="TEAM_ID")
private Team team; private Team team;

View File

@ -20,4 +20,3 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial
# Permet d'exécuter le data.sql # Permet d'exécuter le data.sql
# =============================== # ===============================
## spring.datasource.initialization-mode=always ## spring.datasource.initialization-mode=always