记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Switch branch/tag
  1. 14 Sep, 2021 3 commits
  3. 13 Sep, 2021 15 commits
    • liuran's avatar
      修改会员基础信息 · 1ad2ddd1
      liuran authored
      1ad2ddd1
    • liuran's avatar
      Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund · 16fa571b
      liuran authored
      16fa571b
    • anjiabin's avatar
      提交chime社交相关 · e86a2491
      anjiabin authored
      e86a2491
    • anjiabin's avatar
      Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev-social · d0a894c2
      anjiabin authored 
      # Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java
#	liquidnet-bus-api/pom.xml
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DMCheckOrderTimeImpl.java
#	liquidnet-bus-service/pom.xml
      d0a894c2
    • anjiabin's avatar
      Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev-social · 4eb8c711
      anjiabin authored 
      # Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java
#	liquidnet-bus-api/pom.xml
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DMCheckOrderTimeImpl.java
#	liquidnet-bus-service/pom.xml
      4eb8c711
    • 张国柄's avatar
      opt; · 8511084e
      张国柄 authored
      8511084e
    • 胡佳晨's avatar
      修改下单 · 9f554ac3
      胡佳晨 authored
      9f554ac3
    • 张国柄's avatar
      opt; · 70ef4ff2
      张国柄 authored
      70ef4ff2
    • liuran's avatar
      Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev_member_voucher_refund · 364c4d62
      liuran authored 
      # Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberServiceAdminImpl.java
      364c4d62
    • 张国柄's avatar
      去除限购逻辑; · b445b1f6
      张国柄 authored
      b445b1f6
    • liuran's avatar
      opt · b1f56a26
      liuran authored
      b1f56a26
    • 张国柄's avatar
      opt; · a3bb0918
      张国柄 authored
      a3bb0918
    • 张国柄's avatar
      opt; · 4bae3f3b
      张国柄 authored
      4bae3f3b
    • 张国柄's avatar
      opt; · 1e48bb9c
      张国柄 authored
      1e48bb9c
    • 张国柄's avatar
      Merge remote-tracking branch 'origin/master' into dev_member_voucher_refund · 2e1964eb
      张国柄 authored
      2e1964eb
  5. 12 Sep, 2021 3 commits
  7. 10 Sep, 2021 6 commits
  9. 09 Sep, 2021 13 commits