Merge branch 'sprint/S3' into release/S3

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/mapper/CollectionDetailMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.digiwin.athena.app.ptc.infra.repository.CollectionDetailRepository">
 
     <delete id="deleteBatch">
-        delete from cim_collection_detail where tenantsid=#{tenantSid}
+        delete from cim_collection_detail where tenantsid=#{tenantSid} and
         <foreach collection="list" item="item" index="index" separator=" or" open="" close="">
           (
             sales_order = #{item.salesOrder}