Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Smart Energy Management System
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

f64c0332

There was an error fetching the commit references. Please try again later.

Commit f64c0332 authored 2 years ago by Filip Bugoš

Downloads
- Plain Diff

Merge branch 'entity-relationships-fix' into 'milestone-2'

Entity relationships

See merge request !27

parents 8bd5f25d 3a3cb53b

No related branches found

No related tags found

2 merge requests!30Rename microservice4, fix dockerfiles,!27Entity relationships

Pipeline #

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/java/cz/muni/fi/pa165/core/company/Company.java 1 addition, 1 deletion

.../src/main/java/cz/muni/fi/pa165/core/company/Company.java
core/src/main/java/cz/muni/fi/pa165/core/device/Device.java 1 addition, 4 deletions

core/src/main/java/cz/muni/fi/pa165/core/device/Device.java
core/src/main/java/cz/muni/fi/pa165/core/house/House.java 2 additions, 2 deletions

core/src/main/java/cz/muni/fi/pa165/core/house/House.java
core/src/main/java/cz/muni/fi/pa165/core/manufacturer/Manufacturer.java 2 additions, 1 deletion

...java/cz/muni/fi/pa165/core/manufacturer/Manufacturer.java
core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeter.java 1 addition, 1 deletion

...ain/java/cz/muni/fi/pa165/core/smartmeter/SmartMeter.java
core/src/main/java/cz/muni/fi/pa165/core/user/User.java 1 addition, 1 deletion

core/src/main/java/cz/muni/fi/pa165/core/user/User.java
core/src/main/java/cz/muni/fi/pa165/core/user/roles/RoleController.java 2 additions, 0 deletions

...java/cz/muni/fi/pa165/core/user/roles/RoleController.java

with 10 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment