From e7d554f4f8f79eafaa2de3abe036d21e300fd14a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 17:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
index 9acf237..f413d24 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -1,7 +1,5 @@
package com.hz.his.dto.micro;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -32,6 +30,10 @@
private String platformType;
/** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
private String opRoleId;
+ /** 鍒拌璁㈠崟id */
+ private String visitOrderId;
+ /** 鏄惁鑽夌*/
+ private Integer isDraft;
private List<MicroPlanDto> planList;
}
--
Gitblit v1.8.0