Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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

@@ -251,7 +251,7 @@
             CATEGORY_CODE,
             CATEGORY_NAME,
             LENGTH(CATEGORY_CODE) AS codeLength,
-            IFNULL(color,'') AS colour
+            IFNULL(color,'') AS color
         FROM issue_project_category_dict
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CategoryListDTO.java

@@ -25,6 +25,8 @@ public class CategoryListDTO implements Serializable {
      */
     private String categoryName;
 
+    private String color;
+
     /**
      * 个数
      */