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

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

@@ -717,6 +717,7 @@
   </select>
 
   <update id="updateDelivery" parameterType="long">
-    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id=#{id}) where sd_said=#{id} and sa_delivery is null
+    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id =#{id}  and sa_delivery is not null)
+     where  sd_said = #{id}  and sd_delivery is null and exists (select 1 from sale where sa_id =#{id}  and sa_delivery is not null)
   </update>
 </mapper>