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

zf

2023-09-11 3b223008635ef43f0ca64ec64e8afcca7c2fba34

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

 exam-system/src/main/resources/mapper/coalmine/ExaminerManageMapper.xml

对比新文件
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gkhy.exam.coalmine.mapper.ExaminerManageMapper">

</mapper>

 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
{
    /**