Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 730443b70de88d328ffa275f51f69280fda979e4

 laboratory-server/src/main/resources/mapper/ClassifyMapper.xml

@@ -9,5 +9,8 @@
          <if test="fatherName!=null and fatherName!=''">
              AND father_name = #{fatherName}
          </if>
        <if test="sonName!=null and sonName!=''">
            and son_name=#{sonName}
        </if>
    </select>
</mapper>