add s1mple

pom.xml

@@ -202,7 +202,13 @@
 	            <artifactId>ruoyi-common</artifactId>
 	            <version>${ruoyi.version}</version>
 	        </dependency>
-	        
+
+			<!-- new-->
+			<dependency>
+				<groupId>com.fri3nds</groupId>
+				<artifactId>s1mple</artifactId>
+				<version>${ruoyi.version}</version>
+			</dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -213,6 +219,7 @@
 		<module>ruoyi-quartz</module>
 		<module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+		<module>s1mple</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -72,6 +72,12 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
+
+        <!-- new-->
+        <dependency>
+            <groupId>com.fri3nds</groupId>
+            <artifactId>s1mple</artifactId>
+        </dependency>
         
     </dependencies>
 

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -3,6 +3,7 @@ package com.ruoyi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 启动程序
@@ -10,6 +11,11 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ruoyi
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+<<<<<<< Updated upstream
+=======
+@ComponentScan({"com.ruoyi.*","com.fri3nds.*"})
+@MapperScan({"com.ruoyi.*.mapper","com.fri3nds.*.mapper"})
+>>>>>>> Stashed changes
 public class RuoYiApplication
 {
     public static void main(String[] args)