Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zf

2024-03-25 cd02923a7ce1ffa004b3abbb7af67ab6173dd99d

 equipment/equipment-service/src/main/resources/config/mapper/equipment/SafeMaterialDetailInfoMapper.xml

@@ -320,7 +320,8 @@
            delivery_time,
            sm_id,
            receive_uid,
            receive_uname
            receive_uname,
            status
        from safe_material_detail
        where del_flag = 0
            and valid_status = #{validStatus}