From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 14:24:50 +0800 Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。 --- pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java index 59e9e6c..b7e3ba5 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiRequestVo.java @@ -11,7 +11,9 @@ public String code ; public Integer count;//mwTest涓婃姤鏁版嵁鏁伴噺 - + + public Integer overCount;//aepTest缁撴潫涓婃姤鏁版嵁鏁伴噺 + public Boolean over ;//mwTest涓婃姤鏁版嵁缁撴潫 public Long seconds ;//mwTest涓婃姤鏁版嵁鐢ㄦ椂(绉�) @@ -83,5 +85,12 @@ public void setSeconds(Long seconds) { this.seconds = seconds; } - + + public Integer getOverCount() { + return overCount; + } + + public void setOverCount(Integer overCount) { + this.overCount = overCount; + } } -- Gitblit v1.8.0