合并分支 'dxy' 到 'qa'

src/main/resources/mapper/log/SysOperLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wangxiaolu.promotion.domain.log.dao.ISysOperLogDao">
+<mapper namespace="com.wangxiaolu.promotion.domain.log.mapper.SysOperLogMapper">
 
     <resultMap type="com.wangxiaolu.promotion.domain.log.mapper.entity.SysOperLog" id="SysOperLogResult">
         <id     property="operId"         column="oper_id"        />