- 28 Dec, 2021 10 commits
-
-
胡佳晨 authored
-
胡佳晨 authored
# Conflicts: # liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinGetShunFengPriceController.java
-
胡佳晨 authored
-
胡佳晨 authored
-
胡佳晨 authored
-
jiangxiulong authored
-
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
-
jiangxiulong authored
-
sunyuntian authored
-
胡佳晨 authored
-
- 27 Dec, 2021 3 commits
-
-
jiangxiulong authored
-
Administrator authored
删除最后一个 See merge request !149
-
jiangxiulong authored
-
- 24 Dec, 2021 18 commits
-
-
张国柄 authored
# Conflicts: # liquidnet-bus-config/liquidnet-config/application-dev.yml # liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
-
Administrator authored
Pre See merge request !148
-
jiangxiulong authored
-
胡佳晨 authored
-
胡佳晨 authored
-
胡佳晨 authored
-
Administrator authored
Pre See merge request !147
-
jiangxiulong authored
-
jiangxiulong authored
# Conflicts: # liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java
-
胡佳晨 authored
-
jiangxiulong authored
-
胡佳晨 authored
-
jiangxiulong authored
-
jiangxiulong authored
-
jiangxiulong authored
-
jiangxiulong authored
-
jiangxiulong authored
-
胡佳晨 authored
receivingStatus = 3 改为 receivingStatus = 2 collectCoupon 方法 注释修改券逻辑
-
- 23 Dec, 2021 9 commits
-
-
胡佳晨 authored
receivingStatus = 3 改为 receivingStatus = 2 collectCoupon 方法 注释修改券逻辑
-
胡佳晨 authored
receivingStatus = 3 改为 receivingStatus = 2 collectCoupon 方法 注释修改券逻辑
-
胡佳晨 authored
-
胡佳晨 authored
-
胡佳晨 authored
-
Administrator authored
Pre See merge request !146
-
jiangxiulong authored
-
sunyuntian authored
-
sunyuntian authored
-
