Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/ErpAccount.java

@@ -167,18 +167,4 @@ public class ErpAccount implements Serializable {
         return serialVersionUID;
     }
 
-
-    @Override
-    public String toString() {
-        return "ErpAccount{" +
-                "WbsDetails='" + WbsDetails + '\'' +
-                ", ProjectDefinitionCode='" + ProjectDefinitionCode + '\'' +
-                ", ProjectDefinitionDetails='" + ProjectDefinitionDetails + '\'' +
-                ", subjectName='" + subjectName + '\'' +
-                ", lineItemAmount='" + lineItemAmount + '\'' +
-                ", theNumber='" + theNumber + '\'' +
-                ", materialDetails='" + materialDetails + '\'' +
-                ", unit='" + unit + '\'' +
-                '}';
-    }
 }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/ErpCredit.java

@@ -26,28 +26,6 @@ public class ErpCredit extends DataEntity<ErpCredit>{
     private List<ErpCreditChild2> erpCreditChild2s = new ArrayList<ErpCreditChild2>();
     private List<ErpCreditChild3> erpCreditChild3s = new ArrayList<ErpCreditChild3>();
 
-    @Override
-    public String toString() {
-        return "ErpCredit{" +
-                "itemId='" + itemId + '\'' +
-                ", itemName='" + itemName + '\'' +
-                ", actualInvestment=" + actualInvestment +
-                ", transferAssets=" + transferAssets +
-                ", consBuildingFee=" + consBuildingFee +
-                ", consInstallFee=" + consInstallFee +
-                ", consTotalFee=" + consTotalFee +
-                ", otherSupervisorFee=" + otherSupervisorFee +
-                ", otherDesignFee=" + otherDesignFee +
-                ", otherBeWorkFee=" + otherBeWorkFee +
-                ", otherBuildLoan=" + otherBuildLoan +
-                ", otherLineDamages=" + otherLineDamages +
-                ", otherLegalManage=" + otherLegalManage +
-                ", otherTotalFee=" + otherTotalFee +
-                ", erpCreditChild1s=" + erpCreditChild1s +
-                ", erpCreditChild2s=" + erpCreditChild2s +
-                ", erpCreditChild3s=" + erpCreditChild3s +
-                '}';
-    }
 
     public String getItemId() {
         return itemId;

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/ErpCreditChild1.java

@@ -4,6 +4,7 @@ import com.jeeplus.core.persistence.DataEntity;
 
 public class ErpCreditChild1 extends DataEntity<ErpCreditChild1> {//设备费实体类
     private static final long serialVersionUID = 1L;
+
     private String eqmMaterialDetails1;//设备物料描述
     private String eqmUnit;//设备单位
     private Double eqmNumbers;//设备台数
@@ -19,22 +20,6 @@ public class ErpCreditChild1 extends DataEntity<ErpCreditChild1> {//设备费实
         super();
     }
 
-    @Override
-    public String toString() {
-        return "ErpCreditChild1{" +
-                "eqmMaterialDetails1='" + eqmMaterialDetails1 + '\'' +
-                ", eqmUnit='" + eqmUnit + '\'' +
-                ", eqmNumbers=" + eqmNumbers +
-                ", eqmTotalCapacity='" + eqmTotalCapacity + '\'' +
-                ", eqmBookedFee1=" + eqmBookedFee1 +
-                ", erpCredit=" + erpCredit +
-                '}';
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
     public String getEqmMaterialDetails1() {
         return eqmMaterialDetails1;
     }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/ErpCreditChild2.java

@@ -15,19 +15,6 @@ public class ErpCreditChild2 extends DataEntity<ErpCreditChild2> {//材料费实
         super();
     }
 
-    @Override
-    public String toString() {
-        return "ErpCreditChild2{" +
-                "mtlBookedFee2=" + mtlBookedFee2 +
-                ", eqmMaterialDetails2='" + eqmMaterialDetails2 + '\'' +
-                ", erpCredit=" + erpCredit +
-                '}';
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
     public Double getMtlBookedFee2() {
         return mtlBookedFee2;
     }

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/entity/ErpCreditChild3.java

@@ -19,22 +19,7 @@ public class ErpCreditChild3 extends DataEntity<ErpCreditChild3> {//10kv线路
     public ErpCreditChild3(){
         super();
     }
-    @Override
-    public String toString() {
-        return "ErpCreditChild3{" +
-                "tenKvModel='" + tenKvModel + '\'' +
-                ", tenKvUnit='" + tenKvUnit + '\'' +
-                ", tenKvLength=" + tenKvLength +
-                ", tenKvLineLength=" + tenKvLineLength +
-                ", tenKvItsLine=" + tenKvItsLine +
-                ", tenKvItesFhvFollow=" + tenKvItesFhvFollow +
-                ", erpCredit=" + erpCredit +
-                '}';
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
+
 
     public String getTenKvModel() {
         return tenKvModel;