Merge remote-tracking branch 'origin/master'

huangzhen

2023-09-26 7a393cea127859281a4edd08d6f75630a8d429a5

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

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