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/pojoBa/BaDistrict.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
index 083d580..dcfa310 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
@@ -42,6 +42,7 @@
* 涓婄骇琛屼笅鍖篒D
*/
@Schema(description = "涓婄骇瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long supperId;
/**
@@ -55,9 +56,9 @@
/**
* 琛屾斂鍖虹紪鍙�
*/
- @Schema(description = "琛屾斂鍖虹紪鍙�(鐪佸競鍘�2浣嶏紝闀囨潙3浣�)", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Schema(description = "琛屾斂鍖虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "琛屾斂鍖虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Max(message = "琛屾斂鍖虹紪鍙蜂笉澶т簬99", value = 999)
+ @Max(message = "琛屾斂鍖虹紪鍙蜂笉澶т簬99", value = 99)
@Min(message = "琛屾斂鍖虹紪鍙蜂笉灏忎簬0",value = 0)
public String num;
--
Gitblit v1.8.0