Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

 src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml

@@ -8,6 +8,9 @@
        <if test="strain.strainType!=null and strain.strainType!=''">
            and strain_type = #{strain.strainType}
        </if>
        <if test="strain.tenantId!=null and strain.tenantId!=''">
            and tenant_id = #{strain.tenantId}
        </if>
        <if test="strain.strainName!=null and strain.strainName!=''">
            and strain_name like concat('%',#{strain.strainName},'%')
        </if>