From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java
index 65687e6..f8a4370 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryPlansExtDTO.java
@@ -428,6 +428,8 @@
@ApiModelProperty(value = "绯荤粺鐢ㄦ埛淇℃伅琛ㄧ敤鎴风被鍨� 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛", example = "1")
private Integer usermodelType;
+ @ApiModelProperty(value = "鏌ヨ鏍囪瘑 0澶у睆鏌ヨ", example = "1")
+ private Integer queryType;
@ApiModelProperty(value = "宸ュ簭缂栫爜闆嗗悎", example = "1",hidden = true)
private List<Integer> procedureIds;
@@ -441,8 +443,8 @@
private String mixParam;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ private String planDateStartDate;
@ApiModelProperty(value = "鎴鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ private String planDateEndDate;
}
--
Gitblit v1.9.3