Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP

 Conflicts:

	src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java

	src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java

	src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus;
 
 import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
 import com.dbnt.faisp.faStatistics.crackdownStatus.model.FishingBoat;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java

@@ -1,5 +1,7 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.mapper;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper;
 
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus;
+import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
 import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/CaptinPhotoFile.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.FileInfo;
 import lombok.*;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/CrackdownStatus.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/ProcessResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Sailor.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CaptionPhotoFileRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.CaptinPhotoFile;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CaptinPhotoFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CaptionPhotoFileRepository extends JpaRepository<CaptinPhotoFile, CaptinPhotoFile.CaptinPhotoFileId> {

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CrackdownStatusRepository extends JpaRepository<CrackdownStatus, Integer> {

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface FishingBoatRepository extends JpaRepository<FishingBoat, Integer> {

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ProcessResultRepository extends JpaRepository<ProcessResult, Integer> {

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Sailor;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SailorRepository extends JpaRepository<Sailor, Integer> {

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java

@@ -1,6 +1,6 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.Violation;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ViolationRepository extends JpaRepository<Violation, Integer> {

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java

@@ -1,7 +1,14 @@
-package com.dbnt.faisp.faStatistics.crackdownStatus.service;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service;
 
 
 import com.dbnt.faisp.config.BaseService;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Sailor;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
+import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
+import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo;
 import com.dbnt.faisp.faStatistics.crackdownStatus.mapper.CrackdownStatusMapper;
 import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
 import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor;

src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java

@@ -1,7 +1,7 @@
 package com.dbnt.faisp.main.fipTarget;
 
 
-import com.dbnt.faisp.fipTarget.model.ShipInfo;
+import com.dbnt.faisp.main.fipTarget.model.ShipInfo;
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.main.fipTarget.model.PartInfo;
 import com.dbnt.faisp.main.fipTarget.model.PartInfoFile;

src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.fipTarget.model;
+package com.dbnt.faisp.main.fipTarget.model;
 
 import com.dbnt.faisp.config.BaseModel;
 
@@ -10,15 +10,11 @@ import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.persistence.*;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
 
 
 @Getter

src/main/resources/mybatisMapper/CrackdownStatustMapper.xml

@@ -3,7 +3,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.dbnt.faisp.faStatistics.crackdownStatus.mapper.CrackdownStatusMapper">
+<mapper namespace="com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper">
     <sql id="selectCrackdownStatusListWhere">
         <where>