Merge branch 'zf1' of https://sinanoaq.cn:8888/r/swspkmas

zf

2023-10-12 0891c8cfbe780fdc56379cb6f5c5365d5e9042ec

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

@@ -1,5 +1,6 @@
package com.ruoyi;

import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;