Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2023-11-13 ffe9c08011d25c39880d107a5f3de249d309c1b4

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

@@ -256,7 +256,7 @@
            and t1.num like concat('%',#{num},'%')
        </if>
        <if test="name != null and name != ''">
            and t1.num like concat('%',#{name},'%')
            and t1.name like concat('%',#{name},'%')
        </if>
        <if test="model != null and model != ''">
            and t1.model like concat('%',#{model},'%')