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-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/Code.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/Code.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/Code.java index 9dc631e..633c79e 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/Code.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/Code.java @@ -6,12 +6,14 @@ public static String cd2 = "002" ;//璇锋眰sepTest鐨勯厤缃� - public static String cd3 = "003" ;//璇锋眰寮�濮嬪伐浣� - - public static String cd4 = "004" ;//鍚戞湇鍔$涓婃姤淇℃伅 + public static String cd3 = "003" ;//璇锋眰寮�濮嬪缓绔嬬綉缁滆繛鎺� - public static String cd5 = "005" ;//鍚戞湇鍔$涓婃姤 瀹屾垚浠诲姟鐨勬暟閲� + public static String cd4 = "004" ;//璇锋眰寮�濮婻TU涓婃姤鏁版嵁 - public static String cd6 = "006" ;//鍚戞湇鍔$涓婃姤 鍏ㄩ儴浠诲姟瀹屾垚 + public static String cd5 = "005" ;//鍚戞湇鍔$涓婃姤淇℃伅 + + public static String cd6 = "006" ;//鍚戞湇鍔$涓婃姤 瀹屾垚浠诲姟鐨勬暟閲� + + public static String cd7 = "007" ;//鍚戞湇鍔$涓婃姤 鍏ㄩ儴浠诲姟瀹屾垚 } -- Gitblit v1.8.0