From 11307b25b3898578cd5867751c1dbfaa7300f148 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期四, 25 七月 2024 15:19:07 +0800 Subject: [PATCH] 解决冲突恢复代码 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java index 2d05741..029060c 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java @@ -85,7 +85,7 @@ (code.equals(cd_99) ? "瀹氭椂鍏抽榾寮�闃�" : (code.equals(cd_A0) ? "瀹氶噺鍏抽榾寮�闃�" : (code.equals(cd_B0) ? "鏌ヨ瀹炴椂鏁版嵁" : - (code.equals(cd_C0) ? "鑷姤瀹炴椂鏁版嵁" : + (code.equals(cd_C0) ? "鑷姤(鏁寸偣)瀹炴椂鏁版嵁" : ""))))))))))))))))))))))))))))))))))))))))) ; return name ; } -- Gitblit v1.8.0