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

Skip to content

L
liquidnet-bus-v1
Switch branch/tag
  1. 18 Sep, 2021 1 commit
  3. 17 Sep, 2021 4 commits
  5. 16 Sep, 2021 1 commit
  7. 14 Sep, 2021 2 commits
  9. 13 Sep, 2021 23 commits
    • anjiabin's avatar
      提交chime社交相关 · 82f8080a
      anjiabin authored
      82f8080a
    • anjiabin's avatar
      提交chime社交相关 · ee54787e
      anjiabin authored
      ee54787e
    • anjiabin's avatar
      Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev-social · 60f29915
      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
      60f29915
    • anjiabin's avatar
      Merge remote-tracking branch 'origin/dev_transfer' into dev-social · b8638514
      anjiabin authored
      b8638514
    • anjiabin's avatar
      Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev-social · a9fedc3b
      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
      a9fedc3b
    • anjiabin's avatar
      Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev-social · fe5e5072
      anjiabin authored 
      # Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
      fe5e5072
    • anjiabin's avatar
      Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev-social · c9765a4c
      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
      c9765a4c
    • 胡佳晨's avatar
      转赠 · def2df03
      胡佳晨 authored
      def2df03
    • anjiabin's avatar
      Merge remote-tracking branch 'origin/dev_transfer' into dev-social · bc99e09b
      anjiabin authored 
      # Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
      bc99e09b
    • 胡佳晨's avatar
      转赠 · fbfb638c
      胡佳晨 authored
      fbfb638c
    • 胡佳晨's avatar
      转赠 · a7fca33b
      胡佳晨 authored
      a7fca33b
    • anjiabin's avatar
      提交chime社交相关 · 71bbd81f
      anjiabin authored
      71bbd81f
    • 胡佳晨's avatar
      admin 修改票种bug · d40f0031
      胡佳晨 authored
      d40f0031
    • 张国柄's avatar
      opt; · a3bb0918
      张国柄 authored
      a3bb0918
    • 张国柄's avatar
      opt; · 4bae3f3b
      张国柄 authored
      4bae3f3b
    • anjiabin's avatar
      提交chime社交相关 · 9ebc85bf
      anjiabin authored
      9ebc85bf
    • 张国柄's avatar
      opt; · 1e48bb9c
      张国柄 authored
      1e48bb9c
    • 胡佳晨's avatar
      job · af5ab493
      胡佳晨 authored
      af5ab493
    • 胡佳晨's avatar
      修改转赠脚本 · e63f4350
      胡佳晨 authored
      e63f4350
    • 胡佳晨's avatar
      修改转赠bug · a127feb6
      胡佳晨 authored
      a127feb6
    • anjiabin's avatar
      提交chime社交相关 · 0821bac4
      anjiabin authored
      0821bac4
    • anjiabin's avatar
      提交chime社交相关 · 8b359620
      anjiabin authored
      8b359620
    • 张国柄's avatar
      Merge remote-tracking branch 'origin/master' into dev_member_voucher_refund · 2e1964eb
      张国柄 authored
      2e1964eb
  11. 12 Sep, 2021 9 commits