Merge branch 'caixiang' of mengtong/mt-pms-api into master

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

.idea/dataSources.local.xml

@@ -2,11 +2,14 @@
 <project version="4">
   <component name="dataSourceStorageLocal">
     <data-source name="mt_erp@47.96.183.77" uuid="b3cb0d92-041d-41fc-ace7-4cc9410e1df1">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" />
+      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
       <secret-storage>master_key</secret-storage>
-      <first-sync>true</first-sync>
       <user-name>root</user-name>
-      <introspection-schemas>*:</introspection-schemas>
+      <schema-mapping>
+        <introspection-scope>
+          <node kind="schema" qname="" />
+        </introspection-scope>
+      </schema-mapping>
     </data-source>
   </component>
 </project>

.idea/encodings.xml

@@ -3,5 +3,6 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/wms-produce-manage" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/wms-produce-manage/src/main/java" charset="UTF-8" />
   </component>
 </project>

wms-parent.iml

@@ -89,7 +89,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_171/lib/jconsole.jar!/" />
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_231/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -98,7 +98,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_171/lib/tools.jar!/" />
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_231/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

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;
     }
 }