mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/domain/MachineAccount.java
@@ -44,7 +44,7 @@ /** * 设备类型id,device_type.id */ private Integer deviceTypeId; private Long deviceTypeId; /** * 加工类型(原设备类型)(立加/卧加/立卧转换/五轴/数控车/复合加工/数控磨/齿加工/电加工) @@ -333,11 +333,11 @@ this.remark = remark; } public Integer getDeviceTypeId() { public Long getDeviceTypeId() { return deviceTypeId; } public void setDeviceTypeId(Integer deviceTypeId) { public void setDeviceTypeId(Long deviceTypeId) { this.deviceTypeId = deviceTypeId; } mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountDTO.java
@@ -42,7 +42,7 @@ /** * 设备类型id,device_type.id */ private Integer deviceTypeId; private Long deviceTypeId; /** @@ -335,11 +335,11 @@ this.status = status; } public Integer getDeviceTypeId() { public Long getDeviceTypeId() { return deviceTypeId; } public void setDeviceTypeId(Integer deviceTypeId) { public void setDeviceTypeId(Long deviceTypeId) { this.deviceTypeId = deviceTypeId; } mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/account/MachineAccountEditDTO.java
@@ -42,7 +42,7 @@ /** * 设备类型id,device_type.id */ private Integer deviceTypeId; private Long deviceTypeId; /** * 加工类型(立加/卧加/立卧转换/五轴/数控车/复合加工/数控磨/齿加工/电加工) @@ -180,17 +180,14 @@ } public Integer getDeviceTypeId() { public Long getDeviceTypeId() { return deviceTypeId; } public void setDeviceTypeId(Integer deviceTypeId) { public void setDeviceTypeId(Long deviceTypeId) { this.deviceTypeId = deviceTypeId; } public String getCategory() { return category; }