解决合并冲突

openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.clinical.mapper.ConditionNoDefinitionMapper">
+
+</mapper>