Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachineLogs.java

@@ -11,7 +11,7 @@ public class PtsMachineLogs {
     private Integer machineId; //机器id
     private Integer employeeId; //员工id
     private Integer produceId; //产品id
-    private Integer process_id; //工序id
+    private Integer processId; //工序id
     private Integer deviceId; //设备id
     private String employeeName; //员工姓名
     private String produceName; //产品名称
@@ -54,12 +54,12 @@ public class PtsMachineLogs {
         this.produceId = produceId;
     }
 
-    public Integer getProcess_id() {
-        return process_id;
+    public Integer getProcessId() {
+        return processId;
     }
 
-    public void setProcess_id(Integer process_id) {
-        this.process_id = process_id;
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
     }
 
     public Integer getDeviceId() {