Merge branch 'dev' of https://github.com/KBDS-Dreamverse/KBDS-ITAM-Ad…

…min-Server into feat/#31

src/main/java/com/kbds/itamserveradmin/domain/asset/entity/AssetNotice.java

@@ -5,7 +5,6 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.tomcat.util.http.parser.ContentRange;
 
 import javax.persistence.*;
 

src/main/java/com/kbds/itamserveradmin/domain/contract/entity/OpStatus.java

@@ -0,0 +1,5 @@
+package com.kbds.itamserveradmin.domain.contract.entity;
+
+public enum OpStatus {
+    IN_OPERATION, IN_DISPOSAL
+}

src/main/java/com/kbds/itamserveradmin/domain/corporation/controller/CooperationController.java → src/main/java/com/kbds/itamserveradmin/domain/corporation/controller/CorporationController.java

@@ -1,4 +1,4 @@
 package com.kbds.itamserveradmin.domain.corporation.controller;
 
-public class CooperationController {
+public class CorporationController {
 }

src/main/java/com/kbds/itamserveradmin/domain/corporation/repository/CooperationRepository.java → src/main/java/com/kbds/itamserveradmin/domain/corporation/repository/CorporationRepository.java

@@ -3,6 +3,6 @@
 import com.kbds.itamserveradmin.domain.corporation.entity.Corporation;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface CooperationRepository extends JpaRepository<Corporation,String> {
+public interface CorporationRepository extends JpaRepository<Corporation,String> {
 
 }

src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CooperationService.java → src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CorporationService.java

@@ -1,4 +1,4 @@
 package com.kbds.itamserveradmin.domain.corporation.service;
 
-public interface CooperationService {
+public interface CorporationService {
 }

src/main/java/com/kbds/itamserveradmin/domain/corporation/service/CorporationServiceImpl.java

@@ -0,0 +1,4 @@
+package com.kbds.itamserveradmin.domain.corporation.service;
+
+public class CorporationServiceImpl implements CorporationService {
+}