• eddie.woo's avatar
    Merge branch 'dev_ken' into lg_temp · 51c6f913
    eddie.woo authored
    # 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
    51c6f913
ApiResultDto.java 1.84 KB