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

  • jiangxiulong's avatar
    Merge branch 'jxl_1214_refund' into dev_merchant · 92a9889c
    jiangxiulong 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/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/KylinExpressModuleController.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-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
    #	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinExpressModule.java
    #	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinExpressModuleMapper.java
    #	liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformTaskHandler.java
    #	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_20211115_express_refund.sql
    #	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinExpressModuleController.java
    92a9889c
Name
Last commit
Last update
..
AdminUpushMapper.java Loading commit data...
KylinBannersMapper.java Loading commit data...
KylinBannersRelationsMapper.java Loading commit data...
KylinBuyNoticeMapper.java Loading commit data...
KylinCheckUserMapper.java Loading commit data...
KylinCheckUserPerformancesMapper.java Loading commit data...
KylinExpressModuleMapper.java Loading commit data...
KylinFieldRelationMapper.java Loading commit data...
KylinFieldStatusMapper.java Loading commit data...
KylinFieldsMapper.java Loading commit data...
KylinFreightChargeMapper.java Loading commit data...
KylinLackRegistersMapper.java Loading commit data...
KylinOrderExpressFeeInfoMapper.java Loading commit data...
KylinOrderExpressMapper.java Loading commit data...
KylinOrderExpressRouteMapper.java Loading commit data...
KylinOrderExpressStatusMapper.java Loading commit data...
KylinOrderImportMapper.java Loading commit data...
KylinOrderRefundBatchesMapper.java Loading commit data...
KylinOrderRefundPicMapper.java Loading commit data...
KylinOrderRefundsEntitiesMapper.java Loading commit data...
KylinOrderRefundsMapper.java Loading commit data...
KylinOrderTaskMapper.java Loading commit data...
KylinOrderTicketEntitiesMapper.java Loading commit data...
KylinOrderTicketRelationsMapper.java Loading commit data...
KylinOrderTicketStatusMapper.java Loading commit data...
KylinOrderTicketVoMapper.java Loading commit data...
KylinOrderTicketsMapper.java Loading commit data...
KylinPerformanceRelationsMapper.java Loading commit data...
KylinPerformanceStatusMapper.java Loading commit data...
KylinPerformancesMapper.java Loading commit data...
KylinRoadShowsMapper.java Loading commit data...
KylinTicketRelationsMapper.java Loading commit data...
KylinTicketStatusMapper.java Loading commit data...
KylinTicketTimeRelationMapper.java Loading commit data...
KylinTicketTimesMapper.java Loading commit data...
KylinTicketsMapper.java Loading commit data...
KylinZhengzaiAppVersionsMapper.java Loading commit data...
PlatformOssFilesMapper.java Loading commit data...
ReportPerformanceMapper.java Loading commit data...