diff --git a/.idea/compiler.xml b/.idea/compiler.xml index f17c313..2309163 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index 75c8f38..19a48b0 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -2,11 +2,14 @@ - + master_key - true root - *: + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index f35b346..db78f10 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,5 +3,6 @@ + \ No newline at end of file diff --git a/wms-parent.iml b/wms-parent.iml index 0568428..14c360c 100644 --- a/wms-parent.iml +++ b/wms-parent.iml @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java index 3a17e6e..d490463 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java @@ -7,7 +7,7 @@ package com.deer.wms.produce.manage.model; */ public class MachiningProductVo extends MachiningProduct { private String specificationBom; - private Integer unitName; + private String unitName; public String getSpecificationBom() { return specificationBom; @@ -17,11 +17,11 @@ public class MachiningProductVo extends MachiningProduct { this.specificationBom = specificationBom; } - public Integer getUnitName() { + public String getUnitName() { return unitName; } - public void setUnitName(Integer unitName) { + public void setUnitName(String unitName) { this.unitName = unitName; } }