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
1 parent dc74b84 commit 9a89b13c01ae256cdfdae4728d69b5f7a6d283d6 h-fuji authored on 4 Jul 2019

Patch

Unified Split

Showing 4 changed files

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/Users.java

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/resources/UsersRest.java

Ignore Space Show notes View src/main/resources/hibernate.cfg.xml

Show line notes below