Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 3b8f9eaa550172ec455bba3a9c52809f67b2c9ee

 inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml

@@ -110,7 +110,7 @@
        <if test="techfather!=null and techfather!=''">
            and techfather like  concat('%',#{techfather},'%')
        </if>
        <if test="material!=null and material!=''">
        <if test="name!=null and name!=''">
            and material like  concat('%',#{name},'%')
        </if>
        <if test="result!=null ">