Merge remote-tracking branch 'origin/dev_special_subject' into develop

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 ">