From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/entity/FlowLog.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/FlowLog.java b/src/main/java/com/zy/asrs/entity/FlowLog.java
index 4146d9e..d5c5fdf 100644
--- a/src/main/java/com/zy/asrs/entity/FlowLog.java
+++ b/src/main/java/com/zy/asrs/entity/FlowLog.java
@@ -262,6 +262,8 @@
otp = "鍙栨秷绉诲簱";
} else if (this.opType == 9L) {
otp = "鍙栨秷璋冩嫧";
+ } else if (this.opType == 101L) {
+ otp = "101.鍏ュ簱";
}
return otp;
}
--
Gitblit v1.9.1