Merge remote-tracking branch 'origin/develop' into dev_shb

# Conflicts:
#	src/main/java/com/ai/da/mapper/entity/SysFile.java

src/main/java/com/ai/da/controller/DesignDetailController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.io.IOException;
 
 
 @Api(tags = "design Detail模块")
@@ -68,5 +69,9 @@ public class DesignDetailController {
         return response;
     }
 
-
+    @ApiOperation(value = "编辑图层大小和位置")
+    @PostMapping("/editLayers")
+    public Response<ComposeLayersVO> editPositionAndScale(@Valid @RequestBody EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException {
+        return Response.success(designItemService.editLayersPositionAndScale(positionAndScaleVO));
+    }
 }