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

Skip to content

L
liquidnet-bus-v1
Switch branch/tag
  1. 24 Nov, 2021 17 commits
    • Tice's avatar
      Merge branch 'dev_merchant' into dev_merchant_tice · dcf9dda9
      Tice authored
      dcf9dda9
    • Tice's avatar
      更新小站内容 · a01e5439
      Tice authored
      a01e5439
    • 胡佳晨's avatar
      提交 · 507aa5f6
      胡佳晨 authored
      507aa5f6
    • 胡佳晨's avatar
      提交 · 974f6a43
      胡佳晨 authored
      974f6a43
    • 胡佳晨's avatar
      提交 · 28e7175b
      胡佳晨 authored
      28e7175b
    • Tice's avatar
      Merge branch 'dev_merchant' into dev_merchant_tice · 5ca4638a
      Tice authored
      5ca4638a
    • Tice's avatar
      添加主办和场地编辑接口 · 6606d29c
      Tice authored
      6606d29c
    • 胡佳晨's avatar
      提交 删除场次 票 · 66a3f5f1
      胡佳晨 authored
      66a3f5f1
    • 胡佳晨's avatar
      提交 删除场次 票 · b1342929
      胡佳晨 authored
      b1342929
    • 胡佳晨's avatar
      合并 app 快递接口 · 10eb45d2
      胡佳晨 authored
      10eb45d2
    • 胡佳晨's avatar
      Merge remote-tracking branch 'origin/dev_freight' into dev_merchant · e89a6b87
      胡佳晨 authored 
      # Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
      e89a6b87
    • Tice's avatar
      Merge branch 'dev_merchant' into dev_merchant_tice · 1e3be563
      Tice authored
      1e3be563
    • jiangxiulong's avatar
      Merge branch 'jxl_1115_refund' into dev_freight · 9ed12908
      jiangxiulong authored 
      # Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
      9ed12908
    • jiangxiulong's avatar
      merge pre · 85ab2117
      jiangxiulong authored
      85ab2117
    • jiangxiulong's avatar
      Merge branch 'pre' into jxl_1115_refund · ee43862d
      jiangxiulong authored 
      # Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
      ee43862d
    • 胡佳晨's avatar
      合并 master 提交代码 · 9ba14e6c
      胡佳晨 authored
      9ba14e6c
    • 胡佳晨's avatar
      Merge branch 'master' into dev_merchant · a0dc3eaf
      胡佳晨 authored 
      # Conflicts:
#	liquidnet-bus-api/pom.xml
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
#	liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java
#	liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java
#	liquidnet-bus-do/pom.xml
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/pom.xml
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/MongoVoUtils.java
#	liquidnet-bus-service/pom.xml
      a0dc3eaf
  3. 23 Nov, 2021 4 commits
  5. 22 Nov, 2021 19 commits