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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterDayGenerate.java

@@ -188,9 +188,9 @@ public class TdHYGFInverterDayGenerate implements Serializable {
     private Double fullhour;
 
     @ExcelProperty("项目公司名称")
-    String regionalCompaniesName;
+    private String regionalCompaniesName;
     @ExcelIgnore
-    String regionalCompaniesCode;
+    private String regionalCompaniesCode;
 
 }
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterMonthGenerate.java

@@ -55,8 +55,8 @@ public class TdHYGFInverterMonthGenerate implements Serializable {
     private Double income;
 
     @ExcelProperty("项目公司名称")
-    String regionalCompaniesName;
+    private String regionalCompaniesName;
     @ExcelIgnore
-    String regionalCompaniesCode;
+    private String regionalCompaniesCode;
 }
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterYearGenerate.java

@@ -54,8 +54,8 @@ public class TdHYGFInverterYearGenerate implements Serializable {
     @ExcelIgnore
     private Double income;
     @ExcelProperty("项目公司名称")
-    String regionalCompaniesName;
+    private String regionalCompaniesName;
     @ExcelIgnore
-    String regionalCompaniesCode;
+    private String regionalCompaniesCode;
 }