解决合并冲突

openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java

@@ -0,0 +1,16 @@
+package com.openhis.clinical.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.clinical.domain.Condition;
+import com.openhis.clinical.domain.ConditionNoDefinition;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+@Repository
+public interface ConditionNoDefinitionMapper extends BaseMapper<ConditionNoDefinition> {
+
+}