Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyShiftIssueTopicsResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,6 +39,12 @@ public class MyShiftIssueTopicsResultDTO implements Serializable {
      */
     private String releaseGridName;
 
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    @JsonIgnore
     private String gridId;
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -425,6 +425,7 @@
     <!-- 个人中心-我发表的话题列表-已转议题列表 -->
     <select id="myShiftIssueTopics" resultType="com.epmet.dto.result.MyShiftIssueTopicsResultDTO">
         SELECT
+            ID AS issueId,
             SOURCE_ID AS topicId,
             UNIX_TIMESTAMP(CREATED_TIME) AS shiftIssueTime,
             SUGGESTION,