From 4a99552e883976adc8b726499caaebbe36f19ea7 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 06 Jul 2020 10:25:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/ScreenController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 9a1c0ce..676b2c9 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1687,7 +1687,7 @@
             params.put("description",parameters.get("description"));
             String paramsJson = params.toJSONString();
             model.addObject("uavDroppointParams", paramsJson);
-            model.setViewName("uavdroppointnew");
+            model.setViewName("uavdroppoint");
             return model;
         } else {
             StringBuilder msg = new StringBuilder();

--
Gitblit v1.8.0