Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-10-26 8c80a8d7d70d0aa19fe194df49c21a88d2ba7589

 ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml

@@ -43,8 +43,9 @@
        ums_sccg_region t4 on t4.id=t1.belong_area
        <where>
            <if test="bayonetName !=null and bayonetName !='' ">
                name like CONCAT('%',#{bayonetName},'%')
                t1.name like CONCAT('%',#{bayonetName},'%')
            </if>
        </where>
        order by t1.id desc
    </select>
</mapper>