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/voSe/VoCards.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCards.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCards.java
index 2ec42d9..95da821 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCards.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCards.java
@@ -26,13 +26,13 @@
     private String cardNum;
 
     @Schema(title = "鐢佃瘽鍙风爜")
-    private Float phone;
+    private String phone;
 
     @Schema(title = "韬唤璇佸彿鐮�")
-    private Float idCard;
+    private String idCard;
 
     @Schema(title = "姘村崱鐘舵��")
-    private Float cardState;
+    private Integer cardState;
 
     @Schema(title = "姘村崱鐘舵�佸悕绉�")
     private String stateName;

--
Gitblit v1.8.0