Skip to content

Gonie #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChanhoPark-s wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Gonie #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaf6553
,,
ldgeao99 Nov 24, 2022
13e6e53
Merge branch 'main' of
ldgeao99 Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Corperate_Project/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="C:/Users/admin/.m2/repository/com/oracle/database/jdbc/ojdbc8/21.7.0.0/ojdbc8-21.7.0.0.jar">
<classpathentry kind="lib" path="C:/Users/DG/.m2/repository/com/oracle/database/jdbc/ojdbc8/21.7.0.0/ojdbc8-21.7.0.0.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Expand Down
2 changes: 1 addition & 1 deletion Corperate_Project/src/main/java/com/basicinfo/controller/LotRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class LotRestController {

// 판매에서 로트 불러오기
@GetMapping(value="/getLot/{itemNo}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseEntity<List<String>> getLot(@PathVariable("itemNo") String no) {
public ResponseEntity<List<LotVO>> getLot(@PathVariable("itemNo") String no) {
System.out.println("?:" + no);
return new ResponseEntity<>(service.getLot(no), HttpStatus.OK);

Expand Down
1 change: 1 addition & 0 deletions Corperate_Project/src/main/java/com/spring/service/LotRestServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public List<LotVO> getLot(String no) {

System.out.println(vo);


}
return lists;
}
Expand Down
4 changes: 2 additions & 2 deletions Corperate_Project/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Built-By: admin
Build-Jdk: 11.0.13
Built-By: DG
Build-Jdk: 11.0.16.1
Created-By: Maven Integration for Eclipse