Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -126,7 +126,9 @@
 	ON a.product_id=b.id
 	WHERE
 	a.is_deleted = "N"
+	<if test="userId !=null">
 	AND  a.user_id = #{userId}
+	</if>
 </select>
 
 <update id="startAndendByuserId" parameterType = "com.diagbot.entity.OpenedProducts">