解决冲突

cd578bb0 · 朱晨阳 · 6053d3b2 · cd578bb0
Commit cd578bb0 authored Nov 27, 2024 by 朱晨阳
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

TdHYGFInverterDayGenerate.java ...oot/module/hygf/api/entity/TdHYGFInverterDayGenerate.java +0 -2

No files found.
--- a/amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterDayGenerate.java
+++ b/amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterDayGenerate.java
@@ -186,8 +186,6 @@ public class TdHYGFInverterDayGenerate implements Serializable {
    private Double income;
    @ExcelIgnore
    private Double fullhour;
-    @ExcelIgnore
-    private String name;

    @ExcelProperty("项目公司名称")
    String regionalCompaniesName;