From 86719a90118b4b458ae593b53457f23c11ee8d44 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 25 七月 2024 15:27:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
index 83b2a95..163416d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
@@ -1,5 +1,4 @@
 package com.dy.pipIrrGlobal.pojoRm;
-
 /**
  * @author ZhuBaoMin
  * @date 2024-05-24 10:46
@@ -24,8 +23,8 @@
 import java.util.Date;
 
 /**
-    * 鍛戒护鏃ュ織琛�
-    */
+ * 鍛戒护鏃ュ織琛�
+ */
 @TableName(value = "rm_command_history", autoResultMap = true)
 @Data
 @Builder
@@ -40,7 +39,7 @@
      */
     @JSONField(serializeUsing = ObjectWriterImplToString.class)
     @TableId(type = IdType.INPUT)
-    private Long id;
+    private Long comId;
 
     /**
      * 鍔熻兘鐮�
@@ -107,7 +106,6 @@
     /**
      * 鍛戒护缁撴灉鍐呭
      */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject resultText;
+    private String resultText;
 
 }
\ No newline at end of file

--
Gitblit v1.8.0