Skip to content

T
traffic-front
Switch branch/tag
  1. 08 Aug, 2018 2 commits
  3. 06 Aug, 2018 1 commit
  5. 02 Aug, 2018 2 commits
  7. 31 Jul, 2018 1 commit
  9. 30 Jul, 2018 2 commits
  11. 26 Jul, 2018 2 commits
  13. 25 Jul, 2018 7 commits
  15. 24 Jul, 2018 1 commit
  17. 23 Jul, 2018 1 commit
  19. 21 Jul, 2018 1 commit
  21. 20 Jul, 2018 1 commit
  23. 18 Jul, 2018 2 commits
  25. 17 Jul, 2018 1 commit
  27. 16 Jul, 2018 1 commit
  29. 13 Jul, 2018 2 commits
  31. 12 Jul, 2018 2 commits
  33. 11 Jul, 2018 2 commits
  35. 10 Jul, 2018 1 commit
  37. 09 Jul, 2018 2 commits
  39. 07 Jul, 2018 1 commit
  41. 06 Jul, 2018 2 commits
    • 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
    • frank.xa.zhang's avatar
      test and fixed issues · 085f4ee4
      frank.xa.zhang authored
      085f4ee4
  43. 05 Jul, 2018 2 commits
    • eddie.woo's avatar
      Merge branch 'dev_ken' into lg_temp · 4af71232
      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
      4af71232
    • eddie.woo's avatar
      modify · 58c219e6
      eddie.woo authored
      58c219e6
  45. 03 Jul, 2018 1 commit