From 5eebc007cfbdf27bde2e1e3f3a63a06f7b2edc0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?=
 <박재우@DESKTOP-EF7ECBO>
Date: Wed, 12 Oct 2022 10:28:39 +0900
Subject: [PATCH] .

---
 .../biz/api/anls/hstry/controller/AnlsHstryController.java  | 4 ++--
 .../palnet/biz/api/anls/hstry/service/AnlsHstryService.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java b/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
index 6f09bce..8b358b9 100644
--- a/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
+++ b/src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
@@ -45,8 +45,8 @@ public class AnlsHstryController {
 	@ApiOperation(value = "비행 현황 목록 출력")
 	@Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API")
 	public ResponseEntity<? extends BasicResponse> list(AnlsHstryGroupModel rq) {
-		List<AnlsHstryRsModel> rs = null;
-		ComnPagingRs<AnlsHstryRsModel> response;
+		List<AnlsHstryModel> rs = null;
+		ComnPagingRs<AnlsHstryModel> response;
 		
 		//입력값 검증
 		if(rq.getStDate() == null || !(rq.getStDate().length() == 10) || rq.getEndDate() ==null || !(rq.getEndDate().length() == 10) ) {
diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
index 0742a67..3db65fd 100644
--- a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
+++ b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
@@ -66,17 +66,17 @@ public class AnlsHstryService {
 	private  JwtTokenUtil jwtTokenUtil;
 	
 	//비행이력현황 list
-	public ComnPagingRs<AnlsHstryRsModel> list(AnlsHstryGroupModel rq){
+	public ComnPagingRs<AnlsHstryModel> list(AnlsHstryGroupModel rq){
 		Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
 		List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken();
 		String appAuth = jwtTokenUtil.getUserAuthByToken();
-		ComnPagingRs<AnlsHstryRsModel> response = new ComnPagingRs<>();
+		ComnPagingRs<AnlsHstryModel> response = new ComnPagingRs<>();
 		Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());
 		
 		if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) {
 			
 		}
-		PageImpl<AnlsHstryRsModel> result = query.listCntrlBasRs(rq, pageable);
+		PageImpl<AnlsHstryModel> result = query.listCntrlBasRs(rq, pageable);
 		
 		long total = query.countCntrlBasRs(rq, cstmrSno);
 		long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();