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

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 screen-common/src/main/java/com/moral/util/FileUtils.java

@@ -14,7 +14,7 @@
     */
    public static boolean upload(MultipartFile file, String path, String fileName) {
        //确定上传的文件名
        String realPath = path + "\\" + fileName;
        String realPath = path + File.separator + fileName;
        File dic = new File(path);

        if (!dic.exists()) {