From 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 15 八月 2024 20:13:38 +0800
Subject: [PATCH] 测试git提交冲突问题

---
 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/PmsPlatformApplication.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/PmsPlatformApplication.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/PmsPlatformApplication.java
index ad0ee13..190706b 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/PmsPlatformApplication.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/PmsPlatformApplication.java
@@ -9,7 +9,7 @@
 @SpringBootApplication
 @EnableAspectJAutoProxy
 @ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsPlatform"})
-@MapperScan(basePackages={"com.dy.pmsGlobal.daoBa", "com.dy.pmsGlobal.daoPlt"})
+@MapperScan(basePackages={"com.dy.pmsGlobal.dao*"})
 public class PmsPlatformApplication {
 
     public static void main(String[] args) {

--
Gitblit v1.8.0