Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosServer into CreateUsersHibernate

Fork: 0

nitta-lab-2019 / CosmosServer

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosServer into CreateUsersHibernate # Conflicts: # src/main/java/com/example/cosmos_serversb/entities/User.java COSMOS-462 COSMOS-469 COSMOS-478 CreateShopsRest CreateUsersHibernate RequesetUser chengeLogsProperty fixGetRequests getRequestsListByGid master yolp
commit 76842629f6a508fcea5c0c0034b630cbf5b8ab60 2 parents 9ff93b2 + 88832d8 h-fuji authored on 2 Jul 2019

Patch

Unified Split

Showing 19 changed files

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/entities/Group.java

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/entities/User.java

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/models/Groups.java

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/models/Users.java

Ignore Space Show notes View src/main/resources/Group.hbm.xml

Ignore Space Show notes View src/main/resources/Password.hbm.xml

Ignore Space Show notes View src/main/resources/Request.hbm.xml

Ignore Space Show notes View src/main/resources/Token.hbm.xml

Ignore Space Show notes View src/main/resources/User.hbm.xml

Ignore Space Show notes View src/test/java/hibernateTest/entities/Belong.java 0 → 100644

Ignore Space Show notes View src/test/java/hibernateTest/entities/Group.java

Ignore Space Show notes View src/test/java/hibernateTest/entities/User.java

Ignore Space Show notes View src/test/java/hibernateTest/models/Groups.java

Ignore Space Show notes View src/test/java/hibernateTest/models/Main.java

Ignore Space Show notes View src/test/java/hibernateTest/models/NativeApiIllustrationTest.java

Ignore Space Show notes View src/test/java/hibernateTest/models/Users.java

Ignore Space Show notes View src/test/resources/Belong.xml 0 → 100644

Ignore Space Show notes View src/test/resources/Group.hbm.xml

Ignore Space Show notes View src/test/resources/User.hbm.xml

Show line notes below