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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml

@@ -16,7 +16,7 @@
      <result column="adminId" property="adminId" jdbcType="BIGINT" />



      <association property="userInfo" column="uid"

         select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPKey">

         select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey">

      </association>



      <association property="system" column="sid"