Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

 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");