项目变动增加日志，补充提交

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java

@@ -1,5 +1,8 @@
 package com.epmet.dto.region;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.util.Date;
@@ -44,6 +47,6 @@ public class LogOperationResultDTO {
     /**
      * 操作时间,该时间不是插入数据的时间，而是操作发生的真实时间
      */
-    private Date operatingTime;
+    private Long operatingTime;
 
 }

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java

@@ -163,7 +163,7 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR
             LogOperationResultDTO ldto = new LogOperationResultDTO();
             ldto.setCategory(l.getCategory());
             ldto.setContent(l.getContent());
-            ldto.setOperatingTime(l.getOperatingTime());
+            ldto.setOperatingTime(l.getOperatingTime().getTime());
             ldto.setOperatorId(l.getOperatorId());
             ldto.setTargetId(l.getTargetId());
             ldto.setType(l.getType());

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java

@@ -26,8 +26,8 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:47
  */
-@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageOpenFeignClientFallback.class,url = "http://127.0.0.1:8085")
-//@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageOpenFeignClientFallback.class)
+//@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageOpenFeignClientFallback.class,url = "http://127.0.0.1:8085")
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageOpenFeignClientFallback.class)
 public interface EpmetMessageOpenFeignClient {
     /**
      * 发送短信

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -21,8 +21,8 @@ import java.util.Map;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "http://127.0.0.1:8087")
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "http://127.0.0.1:8087")
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
 public interface EpmetUserOpenFeignClient {
 
     /**

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -390,7 +390,7 @@
                 and MOBILE = #{mobile}
             </if>
             <if test="userIds != null and userIds.size() > 0">
-                and userId in
+                and user_id in
                 <foreach collection="userIds" item="userId" separator="," open="(" close=")">
                     #{userId}
                 </foreach>