fo bo 머지작업(sopmal)

src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/vo/BOMbrVO.java

@@ -3,6 +3,7 @@ package com.wb.domainserver.domain.gcone.mbr.mbr.vo;
 import com.wb.domainserver.domain.comm.vo.AbstractVO;
 import com.wb.domainserver.domain.crm.mbr.vo.CrmMbrVO;
 import com.wb.domainserver.util.dataaccess.DataMap;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -63,10 +64,12 @@ public class BOMbrVO extends AbstractVO{
 	private String mbrTyCd;
 	/**회원id*/
 	private String mbrId;
-	/**회원비밀번호*/
+	/** 회원비밀번호 */
 	private String mbrPassword;
 	/** 변경할 비밀번호 */
 	private String newPassword;
+	/** 변경할 비밀번호 확인 비밀번호 */
+	private String checkPassword;
 	/** 회원비밀번호 확인 */
 	private String mbrPasswordChk;
 	/**비밀번호변경일자*/

src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/vo/BOWishVO.java

@@ -51,6 +51,11 @@ public class BOWishVO extends AbstractVO{
 
 	private String[] wslistInnbArr;
 
+	/** AGENT */
+	private String agent;
+
+	private String serverDv;
+
 
 
 }

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOCrmDlvylcVO.java

@@ -69,4 +69,6 @@ public class BOCrmDlvylcVO extends AbstractVO{
 
 	/* formId */
 	private String formId;
+	/*모바일 여부 확인*/
+	private String isMobile;
 }

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrDlvyVO.java

@@ -39,4 +39,8 @@ public class BOOrdrDlvyVO extends AbstractVO {
     /** 현재 주문 상태 */
     private String currOrdrSttusCd;
 
+    private String dateRange; // 기간
+    private String serverDv; // 서버 구분
+    private String mpageAt; // 마이페이지 여부
+    private String[] cookieValArr;//쿠키
 }

src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/vo/BORtngudrefndVO.java

@@ -199,4 +199,9 @@ public class BORtngudrefndVO extends AbstractVO{
 
 	/** 실 환불 GC 머니 금액  */
 	private String prosbleCancelCashAmt;
+
+	//** 반품처리상태 */
+	private String[] returnProcsStuusCd;
+
+	private String serverDv;
 }