合并数据集前校验重复添加的, 返回错误码

laser/src/main/java/com/fdkankan/indoor/base/constant/MsgCode.java

@@ -16,4 +16,7 @@ public class MsgCode {
 
     /** 状态非法*/
     public static final Integer e3004 = 3004;
+
+    /** 数据集已重复合并*/
+    public static final Integer e3005 = 3005;
 }

laser/src/main/java/com/fdkankan/indoor/core/service/impl/MergeSceneServiceImpl.java

@@ -91,11 +91,10 @@ public class MergeSceneServiceImpl extends IBaseServiceImpl implements MergeScen
     @Override
     public Result merge(String sceneCode, String mergeCode) {
 
-//        List<MergeInfoEntity> mergeList =  mergeInfoService.findByMergeCode(mergeCode);
         List<MergeInfoEntity> mergeList =  mergeInfoService.findBySceneCodeAndMergeCode(sceneCode, mergeCode);
 
         if (mergeList.size() > 0) {
-            return Result.failure("此场景已合并：" + mergeCode);
+            return Result.failure(MsgCode.e3005,"此场景已合并：" + mergeCode);
         }