Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
2026-03-09 18:16:27 +08:00

View File

@@ -1,6 +1,8 @@
package com.openhis.clinical.domain;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
@@ -46,6 +48,7 @@ public class ConditionDefinition extends HisBaseEntity {
private String typeCode;
/** 报表类型 */
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private String reportTypeCode;
/** 描述 */