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

  • jiangxiulong's avatar
    Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant · 417a2829
    jiangxiulong authored
    # Conflicts:
    #	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.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
    417a2829
Name
Last commit
Last update
..
admin Loading commit data...
other Loading commit data...
partner Loading commit data...
IKylinExpressModuleService.java Loading commit data...
IKylinLackRegistersService.java Loading commit data...
IKylinOrderExpress.java Loading commit data...
IKylinOrderImportService.java Loading commit data...
IKylinOrderRefundBatchesService.java Loading commit data...
IKylinOrderRefundPicService.java Loading commit data...
IKylinOrderRefundsEntitiesService.java Loading commit data...
IKylinOrderRefundsService.java Loading commit data...
IKylinOrderTicketEntitiesService.java Loading commit data...
IKylinOrderTicketRelationsService.java Loading commit data...
IKylinOrderTicketStatusService.java Loading commit data...
IKylinOrderTicketsOrderService.java Loading commit data...
IKylinOrderTicketsService.java Loading commit data...
IKylinPerformancesService.java Loading commit data...
IKylinRoadShowsService.java Loading commit data...
IKylinStationService.java Loading commit data...
IKylinTicketTimesService.java Loading commit data...
IKylinTicketsService.java Loading commit data...
IReportPerformanceService.java Loading commit data...
KylinFieldsService.java Loading commit data...