Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Conflicts:
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorServiceApplicationService.java
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorServiceOrderService.java
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/MessageUtil.java
	svr/svr-door-serivce/src/main/resources/application.yml

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorOrderService.java

@@ -1589,20 +1589,12 @@ public class DoorOrderService {
    public File writeWordFile(List<String> orderId,HttpServletResponse response) throws Exception {
        String zipFileName = "服务小结";
        long time = System.currentTimeMillis();
        String exportConclusionList = time+"exportList";
        String path = this.getClass().getResource("/").getPath() + exportConclusionList;
        String zipFileName = "service_summary";
        String exportConclusionList = "exportList";
        String path = System.getProperty("user.dir") +"/" + exportConclusionList;
        System.out.println("path    :"   +path);
//        String path1 = this.getClass().getResource("/").getPath() + exportConclusionList;
//        String c2=path1.substring(0,path1.indexOf("!"));//  ！前面的
//        String c1=path1.substring(path1.lastIndexOf("!")+1);//  !後面的
//        String cc = c2+c1;
//        String path = cc.replace("svr-door-service.jar/","");
//        System.out.println(path);
        File file = new File(path);
        // 删除文件夹、文件
        if (file.exists()) {