From 07648f0083e80cc590ba8bc77a9e72be5ad66748 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 十二月 2024 16:59:45 +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/voRm/VoCommand.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java index 73f38e6..0ac5f2c 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java @@ -19,9 +19,9 @@ private static final long serialVersionUID = 1L; @JSONField(serializeUsing= ObjectWriterImplToString.class) - private Long id; + private Long comId; - private String commandName; + private String commandName; //鍛戒护鍚嶇О private String intakeName; @@ -35,7 +35,9 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date resultTime; - private String result; + private String state;//鎵ц鐘舵�� - private String userName; + private String result;//鍛戒护缁撴灉 + + private String userName;//鎿嶄綔浜� } -- Gitblit v1.8.0