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/voSt/VoCountOfOpenType.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfOpenType.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfOpenType.java index 22eda61..79e1aa8 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfOpenType.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCountOfOpenType.java @@ -13,12 +13,17 @@ public class VoCountOfOpenType { /** + * 寮�闃�鏂圭被鍨� + */ + public Integer openType; + + /** * 寮�闃�鏂圭被鍨嬪悕绉� */ - private String openTypeName; + public String openTypeName; /** * 寮�闃�绫诲瀷娆℃暟 */ - private Integer openTypeCount; + public Integer openTypeCount; } -- Gitblit v1.8.0