Merge remote-tracking branch 'origin/dev' into dev

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -1574,6 +1574,7 @@
     <delete id="deleteTWarehousebillsByIds" parameterType="String">
         delete
         item.*,
+        elabel.*,
         bill.*,
         fess.*,
         enclosure.*
@@ -1582,6 +1583,7 @@
         LEFT JOIN t_warehousebillsfees fess ON fess.f_pid = bill.f_id
         LEFT JOIN t_enclosure enclosure ON enclosure.f_pid = bill.f_id
         LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id
+        LEFT JOIN t_warehousebillsitems_elabel elabel ON elabel.f_pid = item.f_id
         where
         bill.f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">