Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/model/vo/CollectedVO.java

@@ -9,6 +9,8 @@ import java.math.BigDecimal;
 @ApiModel("归集后数据列表")
 public class CollectedVO {
 
+    private Long id;
+
     private Integer year;
 
     private Integer month;
@@ -25,9 +27,9 @@ public class CollectedVO {
 
     private String accountingName;
 
-    private String projectCode;
+    private String productCode;
 
-    private String projectName;
+    private String productName;
 
     private Integer isDirectIncome;