Merge remote-tracking branch 'origin/master'

op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java

@@ -57,6 +57,23 @@ public class MesUnitpriceReport extends BaseEntity {
     @Excel(name = "带线组长")
     private String lineLeader;
 
+    public String getLineLeader() {
+        return lineLeader;
+    }
+
+    public void setLineLeader(String lineLeader) {
+        this.lineLeader = lineLeader;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 //    @Excel(name = "产线编码")
 //    private String sapCode;
 
@@ -466,24 +483,41 @@ public class MesUnitpriceReport extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("workorderCode", getWorkorderCode())
-                .append("workorderCodeSap", getWorkorderCodeSap())
-                .append("productName", getProductName())
-                .append("productCode", getProductCode())
-                .append("userName", getUserName())
-                .append("nickName", getNickName())
-                .append("childprocessCode", getChildprocessCode())
-                .append("childprocessName", getChildprocessName())
-                .append("attr1", getAttr1())
-                .append("attr2", getAttr2())
-                .append("attr3", getAttr3())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
+        return "MesUnitpriceReport{" +
+                "id='" + id + '\'' +
+                ", workorderCode='" + workorderCode + '\'' +
+                ", workOrderProductDate=" + workOrderProductDate +
+                ", workorderCodeSap='" + workorderCodeSap + '\'' +
+                ", productCode='" + productCode + '\'' +
+                ", productName='" + productName + '\'' +
+                ", lineLeader='" + lineLeader + '\'' +
+                ", lineCode='" + lineCode + '\'' +
+                ", equipmentName='" + equipmentName + '\'' +
+                ", userName='" + userName + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", post='" + post + '\'' +
+                ", attr2='" + attr2 + '\'' +
+                ", childprocessName='" + childprocessName + '\'' +
+                ", orderQuantityP='" + orderQuantityP + '\'' +
+                ", umrez='" + umrez + '\'' +
+                ", orderQuantity='" + orderQuantity + '\'' +
+                ", attr1='" + attr1 + '\'' +
+                ", totalQuantity='" + totalQuantity + '\'' +
+                ", result=" + result +
+                ", kk=" + kk +
+                ", bd=" + bd +
+                ", zg=" + zg +
+                ", fg=" + fg +
+                ", sc=" + sc +
+                ", sj=" + sj +
+                ", tsfy=" + tsfy +
+                ", ybbt=" + ybbt +
+                ", xcbt=" + xcbt +
+                ", hj=" + hj +
+                ", realWages='" + realWages + '\'' +
+                ", remark='" + remark + '\'' +
+                ", childprocessCode='" + childprocessCode + '\'' +
+                ", attr3='" + attr3 + '\'' +
+                '}';
     }
 }