충돌 해결

src/modules/basis/group/actions/basisGroupAction.ts

@@ -10,11 +10,7 @@ import {
   UserGroupState,
   GroupState,
   MainGroupData,
-<<<<<<< HEAD
   SelectData
-=======
-  SelectGroupData
->>>>>>> c23747b2de282357d7d8522636559c3d986c93e1
 } from '../models/basisGroupModel';
 
 //# 나의 그룹 목록 조회
@@ -106,13 +102,8 @@ const GROUP_MAIN_LIST_REQUEST = 'basis/group/GROUP_MAIN_LIST_REQUEST';
 const GROUP_MAIN_LIST_SUCCESS = 'basis/group/GROUP_MAIN_LIST_SUCCESS';
 const GROUP_MAIN_LIST_FAILURE = 'basis/group/GROUP_MAIN_LIST_FAILURE';
 
-<<<<<<< HEAD
 //그룹 선택
 const SELECT_GROUP = 'basis/group/SELECT_GROUP';
-=======
-//# 그룹 선택
-const ROUP_SELECT = 'basis/group/select';
->>>>>>> c23747b2de282357d7d8522636559c3d986c93e1
 
 export const MY_LIST = createAsyncAction(
   MY_LIST_REQUEST,
@@ -220,11 +211,7 @@ export const USER_DELEGATE = createAsyncAction(
   USER_DELEGATE_FAILURE
 )<UserGroupState, string, AxiosError>();
 
-<<<<<<< HEAD
 export const SELECT = createAction(SELECT_GROUP)<SelectData>();
-=======
-export const USER_GROUP_SELECT = createAction(ROUP_SELECT)<SelectGroupData>();
->>>>>>> c23747b2de282357d7d8522636559c3d986c93e1
 
 const actions = {
   MY_LIST,
@@ -245,12 +232,7 @@ const actions = {
   USER_DELEGATE,
   GROUP_MYLIST,
   GROUP_MAIN_LIST,
-<<<<<<< HEAD
   SELECT
-=======
-  USER_GROUP_SELECT
->>>>>>> c23747b2de282357d7d8522636559c3d986c93e1
 };
 
-
 export type GroupAction = ActionType<typeof actions>;

src/modules/basis/group/models/basisGroupModel.ts

@@ -18,18 +18,7 @@ export interface GroupState {
   newGroupId: String | '';
   searchParams: string | '';
   error: ErrorModel | undefined;
-<<<<<<< HEAD
   selectData: SelectData | undefined;
-
-=======
-  selectGroup: SelectGroupData | undefined;
-}
-
-export interface SelectGroupData {
-  cstmrSno: number;
-  groupId: string;
-  groupNm: string;
->>>>>>> c23747b2de282357d7d8522636559c3d986c93e1
 }
 
 export interface GroupSearchData {
@@ -127,13 +116,5 @@ export const initGroup = {
   newGroupId: '',
   searchParams: '',
   error: undefined,
-<<<<<<< HEAD
   selectData: undefined
-=======
-  selectGroup: {
-    cstmrSno: 0,
-    groupId: '',
-    groupNm: ''
-  }
->>>>>>> c23747b2de282357d7d8522636559c3d986c93e1
 };

src/modules/basis/group/reducers/basisGroupReducer.ts

@@ -98,17 +98,9 @@ export const groupReducer = createReducer<GroupState, Actions.GroupAction>(
       draft.userCount = count;
     })
   )
-<<<<<<< HEAD
   .handleAction(Actions.SELECT, (state, action) =>
     produce(state, draft => {
       const selectData = action.payload;
       draft.selectData = selectData;
-=======
-  //그룹 선택
-  .handleAction(Actions.USER_GROUP_SELECT, (state, action) =>
-    produce(state, draft => {
-      const data = action.payload;
-      draft.selectGroup = data;
->>>>>>> c23747b2de282357d7d8522636559c3d986c93e1
     })
   );