修复冲突

1 year ago · a1958d43eb
parent 26963776b1
commit a1958d43eb
1 changed files with 1 additions and 0 deletions
--- a/server/app/common/service/storage/Driver.php
+++ b/server/app/common/service/storage/Driver.php
@ -30,6 +30,7 @@ class Driver
    /**
     * 设置上传的文件信息
     * @param string $name
+     * @param boolean $original
     * @return mixed
     */
    public function setUploadFile($name = 'iFile', $original = false)