modify escape false

dromara · Nov 23, 2024 · 1c0d348 · 1c0d348
1 parent 9639547
commit 1c0d348
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/disjob-admin/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/disjob-admin/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -60,7 +60,7 @@ var table = {
                     toolbar: "toolbar",
                     loadingFontSize: 13,
                     striped: true,
-                    escape: true,
+                    escape: false,
                     firstLoad: true,
                     showFooter: false,
                     search: false,
@@ -947,7 +947,7 @@ var table = {
                     fix: false,
                     area: [_width + 'px', _height + 'px'],
                     content: _url,
-                    closeBtn: $.common.isEmpty(options.closeBtn) ? 1 : options.closeBtn,
+                    closeBtn: $.common.isEmpty(options.closeBtn) ? true : options.closeBtn,
                     shadeClose: $.common.isEmpty(options.shadeClose) ? true : options.shadeClose,
                     skin: options.skin,
                     // options.btn设置为0表示不显示按钮

diff --git a/...isor/src/main/java/cn/ponfee/disjob/supervisor/application/response/SchedJobResponse.java b/...isor/src/main/java/cn/ponfee/disjob/supervisor/application/response/SchedJobResponse.java
@@ -65,8 +65,13 @@ public class SchedJobResponse extends ToJsonString implements Serializable {
     private Integer misfireStrategy;
     private Integer routeStrategy;
     private Integer shutdownStrategy;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long lastTriggerTime;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long nextTriggerTime;
+
     private String remark;
 
     private Integer version;