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/pojoPr/PrFlowMonitoring.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java
index 1ca4c29..2182772 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java
@@ -29,7 +29,7 @@
@AllArgsConstructor
@Schema(name = "娴侀噺鐩戞祴绔欏疄浣�")
public class PrFlowMonitoring implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151517004L;
/**
* 涓婚敭
@@ -58,43 +58,36 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@Schema(description = "鎵�鍦ㄦ潙ID", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鎵�鍦ㄦ潙涓嶈兘涓虹┖")
private Long villageid;
/**
* 鐩戞祴绔欏悕绉�
*/
@Schema(description = "鐩戞祴绔欏悕绉�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotBlank(message = "鐩戞祴绔欏悕绉颁笉鑳戒负绌�")
- @Length(message = "鐩戞祴绔欏悕绉颁笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
private String name;
/**
* 缁忓害
*/
@Schema(description = "缁忓害", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "缁忓害涓嶈兘涓虹┖")
private Double lng;
/**
* 绾害
*/
@Schema(description = "缁忓害", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "缁忓害涓嶈兘涓虹┖")
private Double lat;
/**
* 澶囨敞淇℃伅
*/
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 200)
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎿嶄綔浜虹紪鍙蜂笉鑳戒负绌�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long operator;
/**
--
Gitblit v1.8.0