Merge origin/123321 into master

src/main/resources/com/bao/dating/mapper/PostMapper.xml

@@ -135,5 +135,11 @@
     <select id="selectFavoriteCount" resultType="java.lang.Integer">
         select dating.post.favorite_count from dating.post where post.post_id = #{postId}
     </select>
+    <select id="getUsernameByUserId" resultType="map">
+        SELECT u.user_name, u.user_id, p.media_oss_keys
+        FROM post p 
+        LEFT JOIN user u ON p.user_id = u.user_id 
+        WHERE p.post_id = #{postId}
+    </select>
 
 </mapper>

src/main/resources/com/bao/dating/mapper/UserMapper.xml

@@ -111,9 +111,9 @@
         <result property="latitude" column="user_latitude"/>
         <result property="longitude" column="user_longitude"/>
     </resultMap>
-
+    
     <select id="findByLatLngRange" resultMap="UserInfoVOResultMap">
-        SELECT
+        SELECT 
             user_id,
             user_name,
             nickname,