Merge remote-tracking branch 'remotes/origin/develop' into release_temp

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/SubjectListResultDTO.java

@@ -28,4 +28,9 @@ public class SubjectListResultDTO implements Serializable {
      * 专题名字
      */
     private String tagName;
+
+    /**
+     * 标签颜色
+     */
+    private String tagColor;
 }

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -374,9 +374,10 @@
         SELECT
             ss.ID AS specialSubjectId,
             ss.TAG_ID,
-            tc.TAG_NAME
+            tc.TAG_NAME,
+            tc.TAG_COLOR
         FROM special_subject ss
-                 LEFT JOIN tag_customer tc ON (tc.ID = ss.TAG_ID AND tc.DEL_FLAG = 0)
+        LEFT JOIN tag_customer tc ON (tc.ID = ss.TAG_ID AND tc.DEL_FLAG = 0)
         WHERE ss.DEL_FLAG = '0'
           AND (
               <foreach collection="pidList" item="pid" separator=" OR ">

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -213,6 +213,16 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping(value = "/resi/group/topic/topicattachmentlist")
     Result<TopicAttachmentResultDTO> topicAttachmentList(@RequestBody TopicAttachmentFormDTO formDTO);
 
+    /**
+     * @Description  小组内所有历史消息【话题，通知，活动】
+     * @Param tokenDto
+     * @Param topicPageFormDTO
+     * @author zxc
+     * @date 2021/4/28 上午10:41
+     */
+    @PostMapping("/resi/group/topic/allmessages")
+    Result<List<AllMessagesResultDTO>> allMessages(@RequestBody AllMessagesFormDTO formDTO);
+
     /**
      * 获取小组详情
      * @author zhaoqifeng
@@ -261,16 +271,6 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("/resi/group/topic/topiccreateduserbatch")
     Result<List<TopicCreatedUserBatchResultDTO>> topicCreatedUserBatch(@RequestParam("topicIds")List<String> topicIds);
 
-    /**
-     * @Description  小组内所有历史消息【话题，通知，活动】
-     * @Param tokenDto
-     * @Param topicPageFormDTO
-     * @author zxc
-     * @date 2021/4/28 上午10:41
-     */
-    @PostMapping("/resi/group/topic/allmessages")
-    Result<List<AllMessagesResultDTO>> allMessages(@RequestBody AllMessagesFormDTO formDTO);
-
     /**
      * @Description  查询话题信息
      * @Param issueIds