Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Switch branch/tag
  1. 14 Jun, 2022 1 commit
  3. 13 Jun, 2022 1 commit
  5. 09 Jun, 2022 3 commits
    • 1.删除无效的vip历史信息 · 77aaa301
      xianghan authored
    • Merge branch '2.0.0-develop' · b3f3c48e 
      # Conflicts:
#	member-service-impl/src/main/java/com/topdraw/business/module/member/address/domain/MemberAddress.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/profile/domain/MemberProfileBuild.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/profile/service/dto/MemberProfileDTO.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/profile/service/impl/MemberProfileServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/rest/MemberController.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/service/MemberService.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/service/impl/MemberServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/viphistory/service/impl/MemberVipHistoryServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/business/module/user/iptv/domain/UserTv.java
#	member-service-impl/src/main/java/com/topdraw/business/module/user/iptv/service/dto/UserTvDTO.java
#	member-service-impl/src/main/java/com/topdraw/business/module/user/weixin/service/dto/UserWeixinDTO.java
#	member-service-impl/src/main/java/com/topdraw/business/process/domian/TempIptvUser.java
#	member-service-impl/src/main/java/com/topdraw/business/process/rest/MemberOperationController.java
#	member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
#	member-service-impl/src/main/java/com/topdraw/business/process/service/UserOperationService.java
#	member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberOperationServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/resttemplate/RestTemplateClient.java
#	member-service-impl/src/main/resources/config/application-dev.yml
#	member-service-impl/src/test/java/com/topdraw/test/business/basicdata/member/profile/MemberProfileServiceTest.java
#	member-service-impl/src/test/java/com/topdraw/test/business/basicdata/member/rest/MemberControllerTest.java
#	member-service-impl/src/test/java/com/topdraw/test/business/basicdata/member/rest/MemberProfileControllerTest.java
#	member-service-impl/src/test/java/com/topdraw/test/business/process/rest/UserOperationControllerTest.java
      xianghan authored
    • 1.切换主账号时，取消已是主账号的判断条件 · 2fac68f8
      xianghan authored
  7. 02 Jun, 2022 2 commits
  9. 01 Jun, 2022 2 commits
  11. 31 May, 2022 3 commits
  13. 30 May, 2022 2 commits
  15. 27 May, 2022 1 commit
  17. 24 May, 2022 1 commit
  19. 22 May, 2022 1 commit
  21. 21 May, 2022 1 commit
  23. 19 May, 2022 4 commits
  25. 18 May, 2022 1 commit
  27. 17 May, 2022 1 commit
  29. 16 May, 2022 1 commit
  31. 14 May, 2022 1 commit
  33. 05 May, 2022 1 commit
  35. 28 Apr, 2022 2 commits
  37. 26 Apr, 2022 1 commit
  39. 24 Apr, 2022 1 commit
  41. 21 Apr, 2022 5 commits
  43. 20 Apr, 2022 2 commits
  45. 19 Apr, 2022 1 commit
  47. 18 Apr, 2022 1 commit