1. 13 Sep, 2018 1 commit
  2. 23 Aug, 2018 1 commit
  3. 21 Aug, 2018 1 commit
  4. 08 Aug, 2018 1 commit
  5. 07 Aug, 2018 1 commit
  6. 02 Aug, 2018 1 commit
  7. 31 Jul, 2018 1 commit
  8. 22 Jul, 2018 2 commits
  9. 21 Jul, 2018 1 commit
  10. 17 Jul, 2018 2 commits
  11. 16 Jul, 2018 3 commits
  12. 09 Jul, 2018 1 commit
  13. 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
  14. 05 Jul, 2018 3 commits
  15. 04 Jul, 2018 6 commits
  16. 27 Jun, 2018 2 commits
    • ken.q.you's avatar
      Ken · 63aac1da
      ken.q.you authored
      待处理及之前的功能完善
      63aac1da
    • eddie.woo's avatar
      merge ken · cfb73cd2
      eddie.woo authored
      cfb73cd2
  17. 26 Jun, 2018 1 commit
  18. 25 Jun, 2018 1 commit
  19. 21 Jun, 2018 1 commit
  20. 20 Jun, 2018 3 commits
  21. 19 Jun, 2018 3 commits
  22. 14 Jun, 2018 1 commit
  23. 13 Jun, 2018 1 commit