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

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDetailResultDTO.java

@@ -24,6 +24,11 @@ public class ScreenProjectDetailResultDTO implements Serializable {
      * 项目id
      */
     private String projectId;
+    /**
+     * 项目标题
+     */
+    private String projectTitle;
+
     /**
      * 议题内容，其实就是项目内容
      */

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml

@@ -60,6 +60,7 @@
     <select id="projectDistributionDetail" resultType="com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO">
         SELECT
             project_id as projectId,
+            PROJECT_TITLE as projectTitle,
             project_content AS projectContent,
             project_create_time as reportTime,
             ALL_CATEGORY_NAME as categoryName,