diff --git a/epdc-cloud-heart/pom.xml b/epdc-cloud-heart/pom.xml index 79765b6..22759fd 100644 --- a/epdc-cloud-heart/pom.xml +++ b/epdc-cloud-heart/pom.xml @@ -157,7 +157,7 @@ elink!888 - + yushan_epdc_test elink-epdc@yushan @@ -185,7 +185,7 @@ elink!888 - + yushan_epdc_test elink-epdc@yushan diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java index 41bbe86..5c25ef4 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java @@ -38,12 +38,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.ActStateConstant; import com.elink.esua.epdc.constant.ActUserRelationStatusConstant; import com.elink.esua.epdc.constant.HeartNoticeConstant; +import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; -import com.elink.esua.epdc.dto.logs.PointsLogsDTO; import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao; import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity; import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity; diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java index f11a0e1..797c0d9 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java @@ -40,11 +40,11 @@ import com.elink.esua.epdc.constant.ActStateConstant; import com.elink.esua.epdc.constant.ActUserPointsOperationTypeConstant; import com.elink.esua.epdc.constant.ActUserRelationStatusConstant; import com.elink.esua.epdc.constant.HeartNoticeConstant; +import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; -import com.elink.esua.epdc.dto.logs.PointsLogsDTO; import com.elink.esua.epdc.modules.activity.dao.ActInfoDao; import com.elink.esua.epdc.modules.activity.dao.ActUserLogDao; import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao; diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java index 077ec11..77d9370 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java @@ -1,9 +1,8 @@ package com.elink.esua.epdc.modules.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; - import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.logs.PointsLogsDTO; +import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.modules.feign.fallback.PointsFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java index 01597dd..5842383 100644 --- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java +++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java @@ -3,7 +3,7 @@ package com.elink.esua.epdc.modules.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.logs.PointsLogsDTO; +import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.modules.feign.PointsFeignClient; import org.springframework.stereotype.Component;