Merge remote-tracking branch 'origin/moly'

# Conflicts: # .idea/workspace.xml # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class

Merge remote-tracking branch 'origin/moly'
589a87a3 · 胡斌 · 196ed4fc · 9f521987 · 589a87a3
Commit 589a87a3 authored Dec 11, 2017 by 胡斌
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

ModelMaintainController.java .../com/hp/cmsz/web/modelmanage/ModelMaintainController.java +1 -0

No files found.
--- a/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java
+++ b/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java
@@ -88,6 +88,7 @@ public class ModelMaintainController {
        model.put("deployedServerList", deployedServerList);
        model.put("dataTypeList", dataTypeList);

+        //wei  le  测试 自己的判断
        return PageURLController.ModelMaintain;
    }