From 9d5309c820d525b46e65490475957b641707db51 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 15:57:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
index 678e0f6..c7f1e2b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
@@ -81,7 +81,7 @@
model.addAttribute("num2",jsonObject.getInteger("num2"));
model.addAttribute("num3",jsonObject.getInteger("num3"));
model.addAttribute("num4",jsonObject.getInteger("num4"));
- model.addAttribute("num5",jsonObject.getInteger("num5"));
+// model.addAttribute("num5",jsonObject.getInteger("num5"));
return PREFIX + "tSystemConfigDispatchRules.html";
}
@@ -113,7 +113,8 @@
JSONObject jsonObject = JSONObject.parseObject(tSystemConfig.getContent());
model.addAttribute("num1",jsonObject.getInteger("num1"));
model.addAttribute("num2",jsonObject.getInteger("num2"));
- model.addAttribute("num3",jsonObject.getInteger("num3"));
+ model.addAttribute("num3",jsonObject.getString("num3"));
+ model.addAttribute("num4",jsonObject.getString("num4"));
return PREFIX + "tSystemConfigExtractionRules.html";
}
/**
--
Gitblit v1.7.1