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/service/DocTypeService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/DocTypeService.java b/src/main/java/com/zy/asrs/service/DocTypeService.java
index 01e0aae..35e585d 100644
--- a/src/main/java/com/zy/asrs/service/DocTypeService.java
+++ b/src/main/java/com/zy/asrs/service/DocTypeService.java
@@ -5,4 +5,6 @@
public interface DocTypeService extends IService<DocType> {
+ DocType selectOrAdd(String docName, Boolean pakin);
+
}
--
Gitblit v1.9.1