Merge branch 'release-swsx' into test

src/main/java/com/fdkankan/contro/controller/LaserApiController.java

@@ -2,8 +2,8 @@ package com.fdkankan.contro.controller;
 
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.contro.dto.GenerateObjFileDTO;
-import com.fdkankan.contro.common.Result;
 import com.fdkankan.contro.service.IGenerateObjFileService;
+import com.fdkankan.web.response.Result;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,7 +31,6 @@ public class LaserApiController {
         if (StringUtils.isEmpty(num)) {
             return Result.failure(ErrorCode.FAILURE_CODE_3001.code(), ErrorCode.FAILURE_CODE_3001.message());
         }
-        generateObjFileService.generateObjFile(num);
-        return Result.success();
+        return generateObjFileService.generateObjFile(num);
     }
 }

src/main/java/com/fdkankan/contro/service/IGenerateObjFileService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.contro.service;
 
-import com.fdkankan.contro.common.Result;
+
+import com.fdkankan.web.response.Result;
 
 public interface IGenerateObjFileService {
 

src/main/java/com/fdkankan/contro/service/impl/GenerateObjFileServiceImpl.java

@@ -7,7 +7,7 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.constant.SceneKind;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.contro.common.Result;
+import com.fdkankan.web.response.Result;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
 import com.fdkankan.contro.entity.ScenePro;