Merge branch 'feature-迪维-dsx' into test

src/main/java/com/fdkankan/openApi/controller/www/SceneMarkShapeController.java

@@ -89,9 +89,9 @@ public class SceneMarkShapeController extends BaseController
     @SaIgnore
     @GetMapping("/getShapBox")
     @ValidateApi(method = "scene:getShapBox")
-    public ResultData getShapBox(@RequestParam("num") String num, @RequestParam("showOrig") Integer showOrig) {
+    public ResultData getShapBox(@RequestParam("num") String num, Integer showOrig) {
         this.checkScene(num);
-        return ResultData.ok(sceneMarkShapeBoxService.getShapBox(num));
+        return ResultData.ok(sceneMarkShapeBoxService.getShapBox(num, showOrig));
     }
 
 }