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

jinpengyong

2023-08-23 b1bfa089b5b299c1c3c71094e450748a5e5e8a75

 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()) {