Merge branch 'gaixiankang' into 'dev'

图片素材库 - 逻辑删除

See merge request !237

quality-review/src/main/resources/mapper/UserPhotoStorageMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserPhotoStorageList" parameterType="com.ruoyi.domain.UserPhotoStorage" resultMap="UserPhotoStorageResult">
         <include refid="selectUserPhotoStorageVo"/>
         <where>
+            deleted = 0
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
         </where>