Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

昨天 7f642bd0b97e30ef91ac6d2809d7e4a77d00c7fe

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

@@ -16,7 +16,7 @@
// 表示通过aop框架暴露该代理对象,AopContext能够访问

@EnableAspectJAutoProxy(exposeProxy = true)

// 指定要扫描的Mapper类的包的路径

@MapperScan("com.ruoyi.project.**.mapper")

@MapperScan("com.ruoyi.**.mapper")

public class ApplicationConfig

{

    /**