Merge remote-tracking branch 'origin/master'

rain

2026-02-02 4fa212add5bb7689331e9e070c802bfcb5dcafa2

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdMaterialMapper.xml

@@ -15,6 +15,9 @@

    <select id="selectGdMaterialPage" resultMap="gdMaterialResultMap">
        select * from ja_gd_material where is_deleted = 0
        <if test="gdMaterial.materialName != null">
            and material_name like concat('%',#{gdMaterial.materialName},'%')
        </if>
    </select>