Merge branch 'dev_ken' into lg_temp

# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceEntityType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceRefundReason.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceSourceType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceStatusType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceUploadType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumIsIncludedInTaxAmountType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumProductionServiceType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumProductionType.java
#	atms-api/src/main/java/pwc/taxtech/atms/controller/input/InvoiceManageController.java
#	atms-api/src/main/java/pwc/taxtech/atms/dao/InputInvoiceMapper.java
#	atms-api/src/main/java/pwc/taxtech/atms/dto/input/InputInvoiceDto.java
#	atms-api/src/main/java/pwc/taxtech/atms/dto/input/InputInvoiceQuery.java
#	atms-api/src/main/java/pwc/taxtech/atms/service/InvoiceManageService.java
#	atms-api/src/main/java/pwc/taxtech/atms/service/impl/InvoiceManageServiceImpl.java
#	atms-api/src/main/resources/sqlMapConfig.xml

atms-api/src/main/java/pwc/taxtech/atms/controller/input/InvoiceManageController.java

 package pwc.taxtech.atms.controller.input;
 
-import org.apache.commons.net.nntp.NewGroupsOrNewsQuery;
+import io.swagger.annotations.ApiOperation;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.github.junrar.unpack.decode.LitDecode;
-import com.github.pagehelper.PageHelper;
-
-import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.controller.BaseController;
 import pwc.taxtech.atms.dto.ApiResultDto;
-import pwc.taxtech.atms.dto.OperationResultDto;
-import pwc.taxtech.atms.dto.input.CamelPagingDto;
-import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
-import pwc.taxtech.atms.dto.input.InputInvoiceDto;
-import pwc.taxtech.atms.dto.input.InputInvoiceItemDto;
-import pwc.taxtech.atms.dto.input.InputInvoiceQueryDto;
-import pwc.taxtech.atms.dto.input.InvoiceFilterDto;
-import pwc.taxtech.atms.dto.vatdto.CustomsInvoiceFilter;
-import pwc.taxtech.atms.dto.vatdto.JsonCustomsInvoiceDto;
-import pwc.taxtech.atms.dto.vatdto.OutputVATInvoiceInfoDto;
-import pwc.taxtech.atms.dto.vatdto.QueryOutputDto;
-import pwc.taxtech.atms.entitiy.InputInvoice;
+import pwc.taxtech.atms.dto.input.*;
 import pwc.taxtech.atms.service.InvoiceManageService;
-import pwc.taxtech.atms.thirdparty.ExcelSheet;
 import pwc.taxtech.atms.thirdparty.ExcelUtil;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.servlet.http.HttpServletResponse;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "api/v1/invoiceManage")

atms-api/src/main/java/pwc/taxtech/atms/dao/InputInvoiceItemMapper.java

@@ -4,11 +4,13 @@ import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
+import org.springframework.stereotype.Repository;
 import pwc.taxtech.atms.MyMapper;
 import pwc.taxtech.atms.entitiy.InputInvoiceItem;
 import pwc.taxtech.atms.entitiy.InputInvoiceItemExample;
 
 @Mapper
+@Repository
 public interface InputInvoiceItemMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.