Merge branch 'master' of http://git.midea.com/zhouxiong9/motinova_FactoryTest

# Conflicts:
#	.vs/MOTINOVA_Motor_Factory_Set/v17/.suo
#	StartForm.Designer.cs
#	bin/Debug/CheckSerialNum
#	bin/Debug/MOTINOVA_Motor_Factory_Set.application
#	bin/Debug/MOTINOVA_Motor_Factory_Set.exe
#	bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest
#	bin/Debug/MOTINOVA_Motor_Factory_Set.pdb
#	bin/Debug/Microsoft.mshtml.dll
#	bin/Debug/app.publish/MOTINOVA_Motor_Factory_Set.exe
#	obj/Debug/MOTINOVA_Motor_Factory_Set.application
#	obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.AssemblyReference.cache
#	obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.GenerateResource.cache
#	obj/Debug/MOTINOVA_Motor_Factory_Set.exe
#	obj/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest
#	obj/Debug/MOTINOVA_Motor_Factory_Set.pdb

bin/Debug/CheckSerialNum

@@ -1,4 +1,4 @@
 流水号:
-59
+0
 合格计数:
-23
+0

bin/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,7 +14,11 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+<<<<<<< HEAD
         <dsig:DigestValue>q3UclZkadzz95gj9jqLilfFz4H8QKfVMbGCCjomBUcQ=</dsig:DigestValue>
+=======
+        <dsig:DigestValue>fuSeEFk+f6Kq5OqLPGI+B0zbrEqxjWCmJZk7m9/tJQY=</dsig:DigestValue>
+>>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
       </hash>
     </dependentAssembly>
   </dependency>

bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -66,14 +66,22 @@
     </dependentAssembly>
   </dependency>
   <dependency>
+<<<<<<< HEAD
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027464">
+=======
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027488">
+>>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
       <assemblyIdentity name="Microsoft.mshtml" version="7.0.3300.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+<<<<<<< HEAD
         <dsig:DigestValue>/H806e/4Jx3a5N7ZCRuyIMdykbCfxomNpkv/qcWx9mE=</dsig:DigestValue>
+=======
+        <dsig:DigestValue>xGXpNz0OCYHUD32mNSf9FXVUv11fEmyldeXzyfDdDw8=</dsig:DigestValue>
+>>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
       </hash>
     </dependentAssembly>
   </dependency>
@@ -85,7 +93,11 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+<<<<<<< HEAD
         <dsig:DigestValue>whDiJbUshzeGVNSX12JbxbWy4tiZF/s7yCfEF4N/HU8=</dsig:DigestValue>
+=======
+        <dsig:DigestValue>hkwnEIQSNnOYaqEgEYwOa4GPSVL7P88IOhICwa0jC4Q=</dsig:DigestValue>
+>>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
       </hash>
     </dependentAssembly>
   </dependency>

obj/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,7 +14,11 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+<<<<<<< HEAD
         <dsig:DigestValue>q3UclZkadzz95gj9jqLilfFz4H8QKfVMbGCCjomBUcQ=</dsig:DigestValue>
+=======
+        <dsig:DigestValue>fuSeEFk+f6Kq5OqLPGI+B0zbrEqxjWCmJZk7m9/tJQY=</dsig:DigestValue>
+>>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
       </hash>
     </dependentAssembly>
   </dependency>

obj/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -66,14 +66,22 @@
     </dependentAssembly>
   </dependency>
   <dependency>
+<<<<<<< HEAD
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027464">
+=======
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Microsoft.mshtml.dll" size="8027488">
+>>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
       <assemblyIdentity name="Microsoft.mshtml" version="7.0.3300.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+<<<<<<< HEAD
         <dsig:DigestValue>/H806e/4Jx3a5N7ZCRuyIMdykbCfxomNpkv/qcWx9mE=</dsig:DigestValue>
+=======
+        <dsig:DigestValue>xGXpNz0OCYHUD32mNSf9FXVUv11fEmyldeXzyfDdDw8=</dsig:DigestValue>
+>>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
       </hash>
     </dependentAssembly>
   </dependency>
@@ -85,7 +93,11 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+<<<<<<< HEAD
         <dsig:DigestValue>whDiJbUshzeGVNSX12JbxbWy4tiZF/s7yCfEF4N/HU8=</dsig:DigestValue>
+=======
+        <dsig:DigestValue>hkwnEIQSNnOYaqEgEYwOa4GPSVL7P88IOhICwa0jC4Q=</dsig:DigestValue>
+>>>>>>> b12e3d67c5c78c2904e6021547fbea7bda7d253c
       </hash>
     </dependentAssembly>
   </dependency>