Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: edc811d126d2121519b4c1b79231ab57f2a93028
+  newTag: f724f1b989f4a141018a44842e19e2b2d25f9341

release-service/src/main/resources/mapper/gambit/GambitDao.xml

@@ -583,28 +583,7 @@
         where user_account_id=#{attentionUserAccountId} and attention_user_account_id=#{userAccountId}
     </update>
 
-    <select id="appGambitList" resultMap="appGambitListMap">
-        SELECT DISTINCT
-            fd.id,
-            fd.description,
-            fd.user_account_id,
-            fd.create_time,
-            fd.likes_count,
-            fd.comments_count,
-            fd.transpond
-        FROM
-            forum_dynamic fd
-                INNER JOIN forum_dynamic_gambit fdg ON fd.id = fdg.dynamic_id
-        WHERE 1=1
-            <if test="gambitId!=null ">
-               and fdg.gambit_id = #{gambitId}
-            </if>
-          AND fdg.check_status = 1
-          AND fd.check_status = 1
-        ORDER BY
-            fd.create_time DESC
-            limit #{pageNo}, #{pageSize}
-    </select>
+
 
     <select id="appGambitListCount"  resultType="java.lang.Integer">
         SELECT count(*)
@@ -726,5 +705,27 @@
         select id,user_account_id,like_count,fans_count,attention_count,create_time,update_time
         from forum_count where user_account_id=#{userAccountId}
     </select>
+    <select id="appGambitList" resultType="com.mmc.csf.release.entity.forum.ForumDynamicGambitDO">
+        SELECT DISTINCT
+        fd.id,
+        fd.description,
+        fd.user_account_id,
+        fd.create_time,
+        fd.likes_count,
+        fd.comments_count,
+        fd.transpond
+        FROM
+        forum_dynamic fd
+        INNER JOIN forum_dynamic_gambit fdg ON fd.id = fdg.dynamic_id
+        WHERE 1=1
+        <if test="gambitId!=null ">
+            and fdg.gambit_id = #{gambitId}
+        </if>
+        AND fdg.check_status = 1
+        AND fd.check_status = 1
+        ORDER BY
+        fd.create_time DESC
+        limit #{pageNo}, #{pageSize}
+    </select>
 
 </mapper>