Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ASE_Y2S1_CP_G4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Joshua Gill
ASE_Y2S1_CP_G4
Merge requests
!32
Branch Update
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
Branch Update
develop
into
issueEleven
Overview
0
Commits
6
Pipelines
0
Changes
17
Closed
Joshua Gill
requested to merge
develop
into
issueEleven
3 years ago
Overview
0
Commits
6
Pipelines
0
Changes
17
Expand
0
0
Merge request reports
Compare
issueEleven
issueEleven (base)
and
latest version
latest version
f0ec127a
6 commits,
3 years ago
17 files
+
305
−
28
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
17
Search (e.g. *.vue) (Ctrl+P)
src/main/java/com/example/clientproject/data/shops/Shops.java
+
2
−
1
Options
@@ -45,7 +45,7 @@ public class Shops {
* @param active - shop active status
*/
public
Shops
(
String
name
,
String
website
,
String
description
,
int
earnings
,
String
image
,
String
countries
,
boolean
active
)
{
String
image
,
String
countries
,
boolean
active
,
StampBoards
stampBoard
)
{
this
.
shopName
=
name
;
this
.
shopDescription
=
description
;
this
.
shopWebsite
=
website
;
@@ -53,6 +53,7 @@ public class Shops {
this
.
shopImage
=
image
;
this
.
shopCountries
=
countries
;
this
.
shopActive
=
active
;
this
.
stampBoard
=
stampBoard
;
}
@ManyToMany
(
mappedBy
=
"favouriteShops"
)
Loading