fix():修复合并bug

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java

@@ -3,9 +3,9 @@ package com.muyu.common.core.domain;
 import com.muyu.common.core.constant.Constants;
 import com.muyu.common.core.constant.HttpStatus;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.io.Serializable;
 
@@ -15,7 +15,7 @@ import java.io.Serializable;
  * @author muyu
  */
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 public class Result<T> implements Serializable {
@@ -33,6 +33,7 @@ public class Result<T> implements Serializable {
     public static final int WARN = HttpStatus.WARN;
 
     private static final long serialVersionUID = 1L;
+
     private int code;
 
     private String msg;
@@ -96,8 +97,8 @@ public class Result<T> implements Serializable {
     private static <T> Result<T> restResult (T data, int code, String msg) {
         return Result.<T>builder()
                 .code(code)
-                .data(data)
                 .msg(msg)
+                .data(data)
                 .build();
     }
 

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java

@@ -53,8 +53,15 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl<CarFenceServiceMybai
         return b;
     }
 
+    @Override
+    public Object updateFenceGroupById(Integer groupId) {
+        return null;
+    }
 
-
+    @Override
+    public Object activate(Integer groupId) {
+        return null;
+    }
 
 
     /**