解决合并冲突

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

@@ -0,0 +1,40 @@
+package com.openhis.clinical.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+@Data
+@TableName("cli_condition_no_definition")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ConditionNoDefinition extends HisBaseEntity {
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 国临编码 */
+    private String glNo;
+
+    /** 国临name */
+    private String glName;
+
+    /** 医保编码 */
+    private String icd10No;
+
+    /** 医保name */
+    private String icd10Name;
+
+}