From 43cef17ebd5b267e12fe5aa9c955ef71e9d0f2a4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十二月 2023 15:16:20 +0800
Subject: [PATCH] 测试git冲突
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
index e622e47..240b513 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
@@ -7,6 +7,7 @@
import java.util.List;
public interface BaPrivilegeMapper extends BaseMapper<BaPrivilege> {
+
/**
* 鏌ヨ鍏ㄩ儴
* @return List<BaPrivilege>
--
Gitblit v1.8.0