Skip to content

C
cmszMonitorAnalysis
Commit 589a87a3 authored by 胡斌's avatar 胡斌
Browse files
Options

Merge remote-tracking branch 'origin/moly'

# Conflicts: # .idea/workspace.xml # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class
parents 196ed4fc 9f521987
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java
View file @ 589a87a3
...@@ -88,6 +88,7 @@ public class ModelMaintainController { ...@@ -88,6 +88,7 @@ public class ModelMaintainController {
model.put("deployedServerList", deployedServerList); model.put("deployedServerList", deployedServerList);
model.put("dataTypeList", dataTypeList); model.put("dataTypeList", dataTypeList);
//wei le 测试 自己的判断
return PageURLController.ModelMaintain; return PageURLController.ModelMaintain;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment