From 6a3f8907a2f9d240f8a07e7283682286d2b52c75 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 16:40:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 5c1ed48..dedcdc1 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
@@ -12,7 +12,8 @@
**/
@Data
public class MicroRecordDto extends PageDto {
-
+ /**鏄惁鏌ヨ鏈�鏂扮殑*/
+ private Integer isSelectNew = 0;
/** 鐢ㄦ埛id */
private String userId;
/** 缇庨檯鐨偆鎶ュ憡鏍囪瘑 */
@@ -40,6 +41,10 @@
private List<MicroDataDto> dataList;
/**鏌ヨ鏍囪瘑绫诲瀷:TreatPlan.typeStr*/
private String typeStr;
+ /**鏌ヨ涓�绾ф爣璇�*/
private String firstId;
+ /**鏌ヨ浜岀骇鏍囪瘑*/
private String secondId;
+ /**鍏宠仈澶氱骇鏍囪瘑*/
+ private List<MicroRecordIdDto> idList;
}
--
Gitblit v1.8.0