Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-13 1bca1b9c61676b48cc3137d3003e520c75ecdd92

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java

@@ -16,8 +16,8 @@
// 表示通过aop框架暴露该代理对象,AopContext能够访问
@EnableAspectJAutoProxy(exposeProxy = true)
// 指定要扫描的Mapper类的包的路径
//@MapperScan("com.ruoyi.**.mapper")
@MapperScan({"com.ruoyi.**.mapper","com.ard.**.mapper"})
@MapperScan("com.ruoyi.**.mapper")
//@MapperScan({"com.ruoyi.**.mapper","com.ard.**.mapper"})
public class ApplicationConfig
{
    /**