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

  • 胡佳晨's avatar
    Merge branch 'master' into new_member · 6b2e525b
    胡佳晨 authored
    # Conflicts:
    #	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java
    #	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.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-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/OrderRefundOvertimeServiceImpl.java
    6b2e525b
Name
Last commit
Last update
..
AdminUpushMapper.xml Loading commit data...
FieldRelationsMapper.xml Loading commit data...
FieldStatusMapper.xml Loading commit data...
FieldsMapper.xml Loading commit data...
KylinBannersMapper.xml Loading commit data...
KylinBannersRelationsMapper.xml Loading commit data...
KylinBuyNoticeMapper.xml Loading commit data...
KylinCheckUserMapper.xml Loading commit data...
KylinCheckUserPerformancesMapper.xml Loading commit data...
KylinLackRegistersMapper.xml Loading commit data...
KylinOrderExpressMapper.xml Loading commit data...
KylinOrderRefundBatchesMapper.xml Loading commit data...
KylinOrderRefundPicMapper.xml Loading commit data...
KylinOrderRefundsMapper.xml Loading commit data...
KylinOrderTaskMapper.xml Loading commit data...
KylinOrderTicketEntitiesMapper.xml Loading commit data...
KylinOrderTicketsMapper.xml Loading commit data...
KylinPerformanceStatusMapper.xml Loading commit data...
KylinPerformancesMapper.xml Loading commit data...
KylinRoadShowsMapper.xml Loading commit data...
KylinTicketTimesMapper.xml Loading commit data...
KylinTicketsMapper.xml Loading commit data...
KylinZhengzaiAppVersionsMapper.xml Loading commit data...
ReportPerformanceMapper.xml Loading commit data...