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

  1. 19 Sep, 2021 36 commits
  2. 18 Sep, 2021 4 commits
    • jiangxiulong's avatar
      e · 00df9eea
      jiangxiulong authored
      00df9eea
    • 张国柄's avatar
      Merge remote-tracking branch 'origin/dev-social' into dev_member_voucher_social · 765c3245
      张国柄 authored
      # Conflicts:
      #	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
      #	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/application-dev.yml
      #	liquidnet-bus-config/liquidnet-config/application-test.yml
      #	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-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinForChimeClient.java
      #	liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/config/SecuringRequestInterceptor.java
      #	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/service/impl/KylinPerformancesServiceImpl.java
      #	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
      765c3245
    • 胡佳晨's avatar
      修改配置 · b895564a
      胡佳晨 authored
      b895564a
    • 张国柄's avatar