Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

 screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateDetailController.java

@@ -71,7 +71,7 @@
        if (integer!=200){
            return ResultMessage.ok("操作失败");
        }
         return ResultMessage.ok();
         return ResultMessage.ok(integer);
    }

    /**