Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-25 488b9158fc873d228c2c0106050ece8272a49653

 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwMicroEquipmentMapper.java

@@ -28,7 +28,7 @@
     * @param treeCode
     * @return
     */
    Page<MwMicroEquipmentVO> pageList(Page<MwMicroEquipmentVO> page, @Param("equipmentName") String equipmentName, @Param("status") Integer status, @Param("treeCode") String treeCode);
    Page<MwMicroEquipmentVO> pageList(Page<MwMicroEquipmentVO> page, @Param("equipmentName") String equipmentName, @Param("status") Integer status, @Param("equipmentNumber") String equipmentNumber, @Param("treeCode") String treeCode);

    /**
     * 待处理的医废列表