ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add s1mple

This commit is contained in:
Fr13nds 2019-06-19 14:32:07 +08:00
parent 810f3c3c9e
commit 82c67797bb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

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