合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 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);

}