Merge branch '648540858:wvp-28181-2.0' into develop

xiaoQQya

2023-11-01 941b9a8374c2e148795d0a41c164026aca3345d2

 src/main/java/com/genersoft/iot/vmp/conf/CivilCodeFileConf.java

@@ -12,7 +12,10 @@
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ObjectUtils;

import java.io.*;
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.file.Files;
import java.util.Map;