Merge remote-tracking branch 'origin/master'

dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml

@@ -28,7 +28,7 @@
     </sql>
 
     <select id="selectDaPicturesRecardList" parameterType="DaPicturesRecard" resultMap="DaPicturesRecardResult">
-        select  p.* from da_pictures_recard p
+        select distinct p.* from da_pictures_recard p
         left join da_user_catalog uc on p.mu_id = uc.mu_id
         <where>
             <if test="userId != null"> and uc.user_id = #{userId}</if>