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

admin

2019-08-27 e70728524e32162b940ded71617a08aaa30a7faf

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoModifyRecordMapper.xml

@@ -41,9 +41,9 @@
    </set> where umr_id = #{id,jdbcType=BIGINT}
  </update>
  
  <select id="countByUid" resultMap="BaseResultMap">
  <select id="countByUid" resultType="Long">
     SELECT IFNULL(COUNT(d.`umr_id`),0) FROM yeshi_ec_user_modify_record d
   WHERE d.`umr_uid` = #{uid} 
       <if test="">AND d.`umr_type`= #{type}</if>
       <if test="type != null">AND d.`umr_type`= #{type}</if>
  </select>
</mapper>