Skip to content
Snippets Groups Projects
Commit 48aaa5cf authored by Bryan Zhao's avatar Bryan Zhao
Browse files

Merge branch 'bohanz04_staff_page' of...

Merge branch 'bohanz04_staff_page' of gitlab.cs.washington.edu:cse391/24wi/faang into bohanz04_staff_page
parents fe3d51ba 25d64e2e
No related branches found
No related tags found
2 merge requests!162Bohanz04 staff page,!156Main
......@@ -24,6 +24,16 @@ public class Products { /* a good class, but not as good as cse391 */
}
public Product bohanz04Product() {
return new Product(
"CSE351 hw problem",
"A confusing problem faced",
"test2.jpg",
"image of that problem",
1.00
);
}
public Product kevinh33Product() {
return new Product(
"Duolingo owl",
......@@ -797,14 +807,5 @@ public class Products { /* a good class, but not as good as cse391 */
1000.0
);
}
public Product bohanz04Product() {
return new Product(
"idk",
"1",
"test2.jpg",
"idk",
10.0
);
}
}
......@@ -20,6 +20,15 @@ public class Staff {
}
public Employee bohanz04() {
return new Employee(
"Bryan Zhao",
"Student",
"abcdefg stuff",
"test1.jpg",
"hope to get internship"
);
}
public Employee cuperido() {
return new Employee(
"Young You",
......@@ -818,15 +827,5 @@ public class Staff {
);
}
public Employee bohanz04() {
return new Employee(
"bohanz",
"Student",
"i am i",
"test1.jpg",
"I picture"
);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment