Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/pom.xml

@@ -14,9 +14,9 @@
     <description>applications</description>
     <modules>
         <module>purchase</module>
-        <module>sale</module>
+        <!--<module>sale</module>
         <module>storage</module>
-        <module>money</module>
+        <module>money</module>-->
         <module>document</module>
         <module>commons</module>
     </modules>

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -416,7 +416,7 @@
   <select id="validateCodeWhenInsert" resultMap="int" parameterType="string" >
     select count(1) from purchase where pu_code = #{code}
   </select>
-  <select id="validateCodeWhenInsert" resultMap="int" >
+  <select id="validateCodeWhenUpdate" resultMap="int" >
     select count(1) from purchase where pu_code = #{0} and pu_id != #{1}
   </select>
 </mapper>