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

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -372,7 +372,7 @@
   </update>
 
   <update id="updateNetTotal" parameterType="long">
-    update saledetail a set sd_nettotal=round(ifnull(sd_netprice,0)*nvl(sd_qty,0),2)
+    update saledetail a set sd_nettotal=round(ifnull(sd_netprice,0)*ifnull(sd_qty,0),2)
     where sd_said=#{id}
   </update>
 </mapper>