DTO 配置调整

epdc-cloud-heart/pom.xml

@@ -157,7 +157,7 @@
                 <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>
@@ -185,7 +185,7 @@
                 <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>

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;

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;

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;

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;