From d20dbd5d97b3f418533d5d23fd337cdec9f95939 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 十二月 2023 09:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
index 3218661..4cb4650 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
@@ -41,7 +41,7 @@
// 解析json串 获取时间
JSONObject jsonObject = new JSONObject(storeValueConfig.getContent());
JSONArray timeRulesArray = jsonObject.getJSONArray("time_rules");
- model.addAttribute("content",jsonObject);
+ model.addAttribute("content",jsonObject.toString());
if (timeRulesArray.length() > 0) {
JSONObject timeRule = timeRulesArray.getJSONObject(0);
String startTime = timeRule.getString("startTime");
--
Gitblit v1.7.1