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-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoFlowMonitoring.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoFlowMonitoring.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoFlowMonitoring.java
index b27fa51..df43622 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoFlowMonitoring.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoFlowMonitoring.java
@@ -16,12 +16,12 @@
@Data
@Schema(title = "绠＄綉娴侀噺鐩戞祴绔欒鍥惧璞�")
public class VoFlowMonitoring implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202401241704006L;
@Schema(title = "ID")
@ExcelProperty("ID")
@ColumnWidth(10)
- private Long id;
+ private String id;
@Schema(title = "绠＄綉娴侀噺鐩戞祴绔欏悕绉�")
@ExcelProperty("绠＄綉娴侀噺鐩戞祴绔欏悕绉�")
@@ -31,7 +31,7 @@
@Schema(title = "缁戝畾鐘舵��")
@ExcelProperty("缁戝畾鐘舵��")
@ColumnWidth(15)
- private Integer bindState;
+ private String bindState;
@Schema(title = "鍦板潃")
@ExcelProperty("鍦板潃")
--
Gitblit v1.8.0