Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-11 7b09f233bde70508f6db7e08e983e9a2c4bb3e99

 standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml

@@ -31,13 +31,13 @@
        from mom_ocean.technology_template t
        <where>
            state=1
            <if test="type!=null">
            <if test="type!=null and type!=''">
                and type=#{type}
            </if>
            <if test="element!=null">
            <if test="element!=null and element!=''">
                and element like concat('%',#{element},'%')
            </if>
            <if test="father!=null">
            <if test="father!=null and father!=''">
                and father like concat('%',#{father},'%')
            </if>
        </where>