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-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/QueryVo.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/QueryVo.java
index b8714a2..a421efa 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/QueryVo.java
@@ -4,8 +4,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-import java.time.LocalDateTime;
-
/**
* @author ZhuBaoMin
* @date 2023/12/6 14:18
@@ -29,8 +27,8 @@
@Schema(description = "娉ㄩ攢鏃堕棿_寮�濮�")
- public LocalDateTime cancelTimeStart;
+ public String cancelTimeStart;
@Schema(description = "娉ㄩ攢鏃堕棿_缁撴潫")
- public LocalDateTime cancelTimeStop;
+ public String cancelTimeStop;
}
--
Gitblit v1.8.0