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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/IssueProjectCategoryDictDTO.java

@@ -87,7 +87,7 @@ public class IssueProjectCategoryDictDTO implements Serializable {
     /**
      * 颜色
      */
-    private String colour;
+    private String color;
 
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectCategoryTotalResultDTO.java

@@ -19,7 +19,7 @@ public class ProjectCategoryTotalResultDTO implements Serializable {
     //一级分类名称
     private String categoryName;
     //一级分类颜色
-    private String colour = "";
+    private String color = "";
     //分类下项目总数
     private Integer total = 0;
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -373,7 +373,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 				if (ca.getCategoryCode().equals(l.getCategoryCode())) {
 					dto.setCategoryCode(ca.getCategoryCode());
 					dto.setCategoryName(ca.getCategoryName());
-					dto.setColour(ca.getColour());
+					dto.setColor(ca.getColor());
 				}
 			});
 			map.put(l.getCategoryCode(), l.getCategoryCode());
@@ -385,7 +385,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 				dto.setAgencyId(formDTO.getAgencyId());
 				dto.setCategoryCode(ca.getCategoryCode());
 				dto.setCategoryName(ca.getCategoryName());
-				dto.setColour(ca.getColour());
+				dto.setColor(ca.getColor());
 				resultList.add(dto);
 				map.put(ca.getCategoryCode(), ca.getCategoryCode());
 			}