解决合并冲突，并实现种子junit单元测试
Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index 8a5fdfe..ffda0e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -11,6 +11,7 @@
*
* @author ruoyi
*/
+
@ComponentScan(basePackages = {
"com.ruoyi",
"bounty" // 新增您的包路径
@@ -18,12 +19,15 @@
// 关键添加：扩大MyBatis接口扫描范围
@MapperScan(basePackages = {
"com.ruoyi.**.mapper",
- "bounty.mapper" // 如果bounty下有Mapper接口
+ "bounty.mapper",
+ "com.ruoyi.web.dao.BT",
+ "com.ruoyi.web.dao.sys"
})
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication {
public static void main(String[] args) {
+
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
// ANSI escape code for blue text
@@ -31,6 +35,6 @@
// ANSI escape code to reset text color
String reset = "\u001B[0m";
- System.out.println(blue + " ----贾仁翔 喵喵喵" + reset);
+ System.out.println(blue + " ----我爱雨滔身体好好 喵喵 喵 喵" + reset);
}
}